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

Change-Id: I0202248794249fda16dc8ccc2b04799fb8cab545
tree: 4fd31ff1308c1d6bbb30819b7821f73e4c02a4f1
  1. src/
  2. Android.mk