Ruina Liu c59951dc28 Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44 am: 8c65620d31 am: 311d031d22 ...

am: 57a1d7a669

Change-Id: Ia77a11df8f4e4ed64df96b0323c27f8057bd2992

2017-09-18 18:13:29 +00:00

..

java

Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44 am: 8c65620d31 am: 311d031d22

2017-09-18 18:13:29 +00:00

jni

Merge "vendor apk is unbundled" into oc-mr1-dev am: a26750e757

2017-09-15 00:13:49 +00:00

proto/android

Added WindowConfigurationProto and friends

2017-09-18 07:23:23 -07:00

res

Merge "Change the route name for USB headset"

2017-09-18 04:28:47 +00:00

tests

Merge "Test that the replace flag does not need to be set"

2017-09-18 14:24:41 +00:00