[automerger skipped] DO NOT MERGE Reorganize intents to have the same order
am: 7a360c4a3e -s ours
am skip reason: subject contains skip directive

Change-Id: I3c5332fcadfacd5f14f1f1cb7b1a6f0341bf5184
tree: 39dc1ad6b2c773b60728838b7a86dc2b91e15a2e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg