Robin Lee 5f709dfc1a Merge "Merge "Remove unused network management RPCs" am: 53a122986d am: 10ebc1879b am: 8b90758b25" into oc-dev-plus-aosp ...

am: 7a98adc8fb

Change-Id: I16ddb6384d30ecdac114c3a51876bb2e3fa5d0c1

2017-04-24 20:13:10 +00:00

..

java

Merge "Merge "Remove unused network management RPCs" am: 53a122986d am: 10ebc1879b am: 8b90758b25" into oc-dev-plus-aosp

2017-04-24 20:13:10 +00:00

jni

Merge "Match AHardwareBuffer format name change" into oc-dev am: 489edb395b

2017-04-21 19:05:28 +00:00

proto/android

Add missing services to incident_report

2017-04-17 15:37:57 -07:00

res

resolve merge conflicts of 23f196f347 to master

2017-04-24 12:44:02 -07:00

tests

Merge "Cache the Typeface based on the FontRequest." into oc-dev am: 5b96e55d90

2017-04-21 18:18:19 +00:00