am 1edd7334: merge from open-source master

Merge commit '1edd7334f3ab71386426055e93c6bb003041f802'

* commit '1edd7334f3ab71386426055e93c6bb003041f802':
tree: 954d6a974cf54c149ec8b0c87bf0b87bdbe3e8ca
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE