Christopher Tate 3f9418bf0d Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev ...

am: 78a00503db

Change-Id: Id94c4377bff554a5d40179247b4c0299930a1033

2017-04-29 03:11:43 +00:00

..

java

Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev

2017-04-29 03:11:43 +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 "Throttle location update rate in proximity alert" into oc-dev

2017-04-29 02:52:37 +00:00