Merge changes I2f94d863,Id7f5ce4b,I1c0b5b42,I4d8d8de8,I3765a9ae, ... am: 2cb0136378 am: 4a99bf4519 am: 79299e01b1
am: 041ddb688c

Change-Id: I175be247d013b846447f1122e7a12eba06d80ed7
tree: 268eefd3776e45d67bf4b436e6e7b646dd66ed06
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. LICENSE