am 01d49d70: Fix http://b/2352067 .

Merge commit '01d49d700e55c3c32b8b1bc2c816be6cc76e6409'

* commit '01d49d700e55c3c32b8b1bc2c816be6cc76e6409':
  Fix http://b/2352067 .
tree: df6791b56f9c76e38b5ed884e768aa5acffeabc0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE