am 3a032856: Fix http://b/2248037 .

Merge commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b' into eclair-mr2

* commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b':
  Fix http://b/2248037 .
tree: a5fe2933c4d414feb549868c29fa2e8fc17efe64
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE