Felipe Leme d62d68785e Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev ...

am: bd355dbf58

Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604

2017-12-08 18:39:01 +00:00

..

java

Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev

2017-12-08 18:39:01 +00: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

Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev

2017-12-01 20:20:44 +00: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

2017-11-08 00:15:23 +00:00