Selim Cinek 46443749b6 Merge "Fixed an issue where children would animate strangely when removed" into nyc-dev ...

am: 35a8c2f00e

* commit '35a8c2f00e1c3bb2e2cf24260682400d025a49f0':
  Fixed an issue where children would animate strangely when removed

Change-Id: I6d8a18d325bf8885a46fa20756bb3460cb9fa82f

2016-05-04 23:34:06 +00:00

..

java/com/android/server

Merge "Fixed an issue where children would animate strangely when removed" into nyc-dev

2016-05-04 23:34:06 +00:00

jni

Merge "Revert "TIF: add signal detection feature for HW inputs"" into nyc-dev

2016-05-04 17:42:50 +00:00

Android.mk

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

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