Stefan Ramsauer d043979327 Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev ...

am: ba9ab17434

Change-Id: I9d8025f6eec133ba914a43acf0fce7ddcbf6e6af

2017-04-27 15:17:16 +00:00

..

java

Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev

2017-04-27 15:17:16 +00:00

jni

resolve merge conflicts of 01f050f21f to oc-dev-plus-aosp

2017-04-27 13:56:20 +01:00

proto/android

Add missing services to incident_report

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

res

Merge "Autofill binding permission fixes." into oc-dev

2017-04-27 05:11:38 +00:00

tests

Merge "Avoid ClassCastException in ArrayMap." into oc-dev

2017-04-27 01:31:40 +00:00