Todd Kennedy d27b6e3204 Merge "Merge "fix service binding" into oc-dev am: 4eaeb91e42" into oc-dev-plus-aosp ...

am: af6b454b14

Change-Id: I55e0a3543202407577b6ebd433fdb8b406125137

2017-04-24 21:23:01 +00:00

..

java

Merge "Merge "fix service binding" into oc-dev am: 4eaeb91e42" into oc-dev-plus-aosp

2017-04-24 21:23:01 +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