Merge changes I14a2c0b6,Ic67566c2,Id0ef9164,Iec48f030,Ibe1f9de6, ... am: 5f57e30484 am: 957b00914c am: 5dfcc290dd
am: 2e5f6688cf

Change-Id: I87eb72123f2d856873a30fb53f5ee2e3901bb310
tree: 44feb86cd26e778a587d103c07366d7e47f88f2f
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. LICENSE