Android Build Merger (Role) c2cfe453f2 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc ...

Change-Id: I19c512999a0eae233e2cc7c4d31d0c62556e4ffd

2018-07-06 22:55:14 +00:00

..

java

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc

2018-07-06 22:55:14 +00:00

jni

Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d

2017-10-06 16:53:46 +00:00

res

Import translations. DO NOT MERGE

2018-07-05 13:24:08 -07:00

tests

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96 am: 54f1b302ab

2018-01-31 11:21:02 +00:00