Dianne Hackborn fcab4e793b Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev am: fb5840b0e6 ...

am: 0ef4ea95f2

Change-Id: Ib196133e3affc2a9adc8bb66ffdf7dbf0792d307

2017-04-28 22:52:35 +00:00

..

java

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev am: fb5840b0e6

2017-04-28 22:52:35 +00:00

jni

Merge "Add conic support for Path#approximate" into oc-dev am: ebd44d0076

2017-04-28 19:11:02 +00:00

proto/android

Add missing services to incident_report

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

res

Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev am: fb5840b0e6

2017-04-28 22:52:35 +00:00

tests

Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636

2017-04-28 18:02:57 +00:00