am 4700fed7: Maybe this will silence http://b/2460740

Merge commit '4700fed72b619a09a0d9cac93e86625b95c730dc' into eclair-plus-aosp

* commit '4700fed72b619a09a0d9cac93e86625b95c730dc':
  Maybe this will silence http://b/2460740
tree: db47ed3ea5b48c745b2dce21db2cb5c87c76e8af
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE