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

Merge commit '2347b2335b26edc5b7145759cc8a727fc712b970'

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