Hyunyoung Song 3aab9561b2 Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d8)" into oc-dev am: 48df033607 ...

am: 69d240d584

Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f

2018-01-12 05:44:25 +00:00

..

java

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d8)" into oc-dev am: 48df033607

2018-01-12 05:44:25 +00:00

jni

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

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

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Import translations. DO NOT MERGE

2017-12-21 01:42:20 -08:00

tests

Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba am: a2149abe3a am: 560fb5d050

2017-11-08 00:38:27 +00:00