Etan Cohen 58d610c5c2 Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev ...

am: 19f12028b7

Change-Id: I2a99242470c37ca423221ff31e2fdd72ea53d4f1

2017-08-24 19:54:06 +00:00

..

java

Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev

2017-08-24 19:54:06 +00:00

jni

Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev

2017-08-23 03:54:08 +00:00

proto/android

…

res

Import translations. DO NOT MERGE

2017-08-24 03:52:49 -07:00

tests

Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev

2017-08-24 10:08:15 +00:00