Wale Ogunwale 566db9e729 Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev am: 039dcadc88 ...

am: fe93842543

Change-Id: I8c18041e293f260695bdca4e62c8587df9c50491

2017-04-27 16:59:25 +00:00

..

java/com/android/server

Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev am: 039dcadc88

2017-04-27 16:59:25 +00:00

jni

Merge "Remove uses of SkBitmap::copyTo"

2017-04-27 06:54:52 +00:00

Android.mk

Merge "Add implementation alternatives for OemLockManager."

2017-04-19 22:53:17 +00:00