Android Build Merger (Role) 11275ae028 Merge "resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d am: 2f94877c01"

2016-12-15 00:27:57 +00:00

..

java

resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d

2016-12-15 00:27:08 +00:00

jni

Merge "Fix getConfig function for hw bitmaps"

2016-12-14 20:32:23 +00:00

res

Merge "Change English permission descriptions"

2016-12-15 00:26:40 +00:00

tests

Merge "Add an IPC for requesting network scores."

2016-12-14 03:20:06 +00:00