Michael Wachenschwanz 1f5050c054 Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev ...

am: d32c2a4189

Change-Id: Ie2ad590368e9c10f6222d9ae65470ebb12dabac2

2018-09-05 18:46:57 -07:00

..

java

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev

2018-09-05 18:46:57 -07:00

jni

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

2017-10-31 20:29:00 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Import translations. DO NOT MERGE

2018-07-29 07:40:09 -07:00

tests

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

2018-02-01 23:44:18 +00:00