Jorim Jaggi 3e96d18285 Merge "Also freeze configuration when freezing bounds" into nyc-dev ...

am: 7f303bced8

* commit '7f303bced8b7c1fe7f8e7f93de07106c5c610503':
  Also freeze configuration when freezing bounds

Change-Id: I95ccf9a1ca28d0f90c3fc17bc604e2cc667787d3

2016-05-13 23:23:42 +00:00

..

java/com/android/server

Merge "Also freeze configuration when freezing bounds" into nyc-dev

2016-05-13 23:23:42 +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