am 2a86bd5d: am d24a12a1: am 0d8019cf: Replace shadow workaround with a different one

* commit '2a86bd5dbb2f8fc2c97cbf61e2fdf79bd6cdfe07':
  Replace shadow workaround with a different one
tree: 09fe44235dc605170d1b4ccea1ba1d066664e670
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags