Atanas Kirilov 94fbd36ef8 Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev am: c3b4881ea5 ...

am: 4f74605d11

Change-Id: Id25fb236775c0055f6d9d32b9c67aab5c9acf570

2018-06-05 15:38:16 -07:00

..

java

Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev am: c3b4881ea5

2018-06-05 15:38:16 -07:00

jni

Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev am: c4049e247f

2017-10-31 20:44:22 +00:00

proto/android

Update diskstats to break out code & data.

2018-01-31 21:49:10 +00:00

res

Import translations. DO NOT MERGE

2018-05-17 10:57:03 -07:00

tests

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev am: 36c202ed80

2018-02-02 03:46:04 +00:00