Bryce Lee a35cbafe23 Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev ...

am: 02584a23b3

Change-Id: I6210e77f2d4a2cea52f2a314b2d329b51f79c93a

2017-08-29 17:23:14 +00:00

..

java/com/android/server

Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev

2017-08-29 17:23:14 +00:00

jni

Merge "switch to native_handle_create() for passing ownership"

2017-08-28 08:11:20 +00:00

Android.mk

services.core: remove use of -static hidl java

2017-08-03 15:19:03 -07:00