Merge "Ensure state transition of paused activity." am: c2b9c5388a
am: 11695e8081

* commit '11695e8081b269d489b5b4cc0b0c2075baeebc9b':
  Ensure state transition of paused activity.
tree: 4659d7c62b4286c779c00b8c4e772558e4f74c6b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py