Albert Chaulk eccbbe4ca2 Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev ...

am: 6c34dd58f6

Change-Id: Ia3aa4d9537f141a3132afefbcdac5b0bda61722b

2017-05-11 15:43:47 +00:00

..

java

Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev

2017-05-11 15:43:47 +00:00

jni

Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev

2017-05-11 03:55:40 +00:00

proto/android

Add persistent state for Bluetooth high quality audio support

2017-05-03 04:36:51 +00:00

res

Merge "Import translations. DO NOT MERGE" into oc-dev

2017-05-11 06:02:45 +00:00

tests

Prepare for removal of junit and android.test classes from Android API (step 1)

2017-05-10 09:42:29 +01:00