Snap for 4620899 from 595f3e06805f4d5ceda078fac9ebc127329daac1 to pi-release

Change-Id: I9fe5426ed7001b3a35f99326bd70c236d88b3087
tree: 1e83436dd03fa9ba8e78b81e00c8e507e3bd5f04
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE