[automerger skipped] DO NOT MERGE
am: b6d4a69ae9  -s ours

Change-Id: Ice04403f7927c887c0b6013f86b47df82de8d995
tree: daf7abb595add3ce148b4cdf118a21df2144cfe4
  1. proto/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml