Jason Monk 2af66fb30f Merge "Fix crash when loading resources without code" into pi-dev ...

am: c46279aa98

Change-Id: I3af4a66f050380c507ec59b9136f2ef6a4f41848

2018-05-15 09:52:15 -07:00

..

java

Merge "Fix crash when loading resources without code" into pi-dev

2018-05-15 09:52:15 -07:00

jni

Merge "Merge "When suid_dumpable == 2, set dumpable to 0 for apps" am: 659a13121c" into stage-aosp-master

2018-05-14 11:31:01 -07:00

proto

Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev

2018-05-08 18:09:56 +00:00

res

Merge "autofill save: do not focus on custom sub title for TV" into pi-dev

2018-05-11 19:02:17 -07:00

tests

Merge "Do not parcel legacy TextClassification fields" into pi-dev

2018-05-13 14:44:11 -07:00