Adam Bookatz e9e89d0042 Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 ...

am: 300ebee8c4

Change-Id: I0ae48f45c0debbe2e875ab123491c09bea265c3e

2017-06-08 06:00:42 +00:00

..

java

Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4

2017-06-08 06:00:42 +00:00

jni

Merge "ActivityManagerService: Add support for new stack dumping scheme."

2017-06-05 08:43:09 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Add setting and permission for assist gesture

2017-06-07 21:42:55 -07:00

tests

Merge "Move tests with private APIs to coretests"

2017-06-07 06:21:45 +00:00