Hugo Benichi f59de479ba Merge "Network Service Discovery test: properly release resources" am: c9d24d203d am: 80e0daa870 am: f467db29f9 ...

am: 84b253b0c5

Change-Id: Icd9033ce7e32d5bddc9d0eba38b3b381fe424004

2017-09-04 12:59:49 +00:00

..

java

Merge "Network Service Discovery test: properly release resources" am: c9d24d203d am: 80e0daa870 am: f467db29f9

2017-09-04 12:59:49 +00:00

jni

Merge "Moving IPlayer.aidl to frameworks/av/."

2017-09-01 23:07:07 +00:00

proto/android

Add Rotation Information to WindowManager proto dumpsys

2017-08-28 17:00:01 -07:00

res

Merge "Remove config_tether_apndata for Telstra." into oc-mr1-dev am: 233cc70914

2017-09-01 23:03:04 +00:00

tests

Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev am: 67594c6f54

2017-09-01 01:24:17 +00:00