up
Revert "up"

This reverts commit 979a069db3ad5cecbb3d903ebde968ffdea929f1.
Merge pull request #2 from AndroidOpenSourceXperia/master

Merge with AOSX