Wale Ogunwale 11695e8081 Merge "Ensure state transition of paused activity." ...

am: c2b9c5388a

* commit 'c2b9c5388a4038ba260e2c36b7b8884cf4097c2e':
  Ensure state transition of paused activity.

2015-10-21 16:08:51 +00:00

..

java/com/android/server

Merge "Ensure state transition of paused activity."

2015-10-21 16:08:51 +00:00

jni

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00

Android.mk

…