Jeff Sharkey 2aaa8a6ad5 Merge "Rename Companion permissions" into oc-dev ...

am: 48c0dc6c4b

Change-Id: Ia52e6c6347969612dc1d4baf036fd696ac568c58

2017-04-29 17:15:12 +00:00

..

java

Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev

2017-04-29 16:44:11 +00:00

jni

Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958 am: e0bf06dd9e

2017-04-29 03:19:09 +00:00

proto/android

Add missing services to incident_report

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

res

Merge "Rename Companion permissions" into oc-dev

2017-04-29 17:15:12 +00:00

tests

Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev

2017-04-29 16:44:11 +00:00