am 23518c13: am d08728aa: Merge commit \'a3d7e61812f8d68ca109280c4e7589e4f968723a\' into HEAD

* commit '23518c13828ff82d5284f9df2e8f8b0690e76c46':
tree: cf0dae124eb25c5de4ecf8e54060dfdd07c7f1b7
  1. java/
  2. Android.mk