Merge commit 'f9ae798d38da3a16d3baaeb85f06024ce3537565' into HEAD

Change-Id: I227b1369610836b15fd82da3e78821873226db4a
tree: b7b6d197be29e18a53041f4e5b8ca01064d9dc5b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml