Todd Kennedy 4bb06f9d1f Merge "fix service binding" into oc-dev ...

am: 4eaeb91e42

Change-Id: I89e8c155baf17cb9c6988dda4723fef3daafc545

2017-04-24 19:10:16 +00:00

..

java

Merge "fix service binding" into oc-dev

2017-04-24 19:10:16 +00:00

jni

Merge "Match AHardwareBuffer format name change" into oc-dev

2017-04-21 18:38:23 +00:00

proto/android

Add missing services to incident_report

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

res

Merge "Move settingslib overlays to framework-res." into oc-dev

2017-04-24 18:31:09 +00:00

tests

Merge "Cache the Typeface based on the FontRequest." into oc-dev

2017-04-21 18:09:44 +00:00