Pavel Grafov 49e5ce52bb Merge "Use List instead of array in network logging API." into oc-dev ...

am: 83d139bd1b

Change-Id: Iede6b7a87dd76d931ebfd05c8701169ecf162a5e

2017-04-28 23:07:47 +00:00

..

java

Merge "Use List instead of array in network logging API." into oc-dev

2017-04-28 23:07:47 +00:00

jni

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

2017-04-28 18:53:15 +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

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

tests

Merge "expose the UID in the EventLog API" into oc-dev

2017-04-28 17:46:02 +00:00