am 47a46e23: am 9dcc84d8: am 4e077af2: Fix NPE when activity is null

* commit '47a46e23affae44dd129ce9be2c9d804c1381780':
tree: e3b45e81753a9086747f9ae350b2ae0ba3ef2285
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags