Chong Zhang d9c92e13ef Merge "Do not change surface properties when waiting for transition to ready" into nyc-dev ...

am: cd2b4303ce

* commit 'cd2b4303ceedfc4afa7c0d5d1349b22fc9927173':
  Do not change surface properties when waiting for transition to ready

Change-Id: I31b2b622d750a9f207d69bf2f5f6ce30af2006fa

2016-04-29 20:15:18 +00:00

..

java/com/android/server

Merge "Do not change surface properties when waiting for transition to ready" into nyc-dev

2016-04-29 20:15:18 +00:00

jni

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

Android.mk

Merge "Move UidRange aidl declaration to system/netd" into nyc-dev

2016-04-19 19:19:43 +00:00