am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit 'aa2e7e5fb6358b70d17b5dfe145cef61db1888ce':
tree: dbb8abe3f82dcd8e5419983ff33160ce85dfa03f
  1. java/
  2. src/
  3. Android.mk