Julia Reynolds 4ed4e2d6e6 Merge "Show app ops guts when tap app ops icons" into pi-dev am: 7b894b3fcd ...

am: 6558218cf2

Change-Id: If61c8b33dcac584c685fb5b10acc537b0c0ba10a

2018-03-08 04:27:38 +00:00

..

java

Merge "Show app ops guts when tap app ops icons" into pi-dev am: 7b894b3fcd

2018-03-08 04:27:38 +00:00

jni

Merge "AudioFormat: java-native conversion for xHE-AAC" into pi-dev

2018-03-08 01:54:50 +00:00

proto/android

Dumping stack traces to proto.

2018-03-07 21:50:12 +00:00

res

Merge "Show app ops guts when tap app ops icons" into pi-dev am: 7b894b3fcd

2018-03-08 04:27:38 +00:00

tests

Merge "Fix accessibility action parceling" into pi-dev

2018-03-08 01:49:43 +00:00