Makoto Onuki f56aa71b9f Merge "Don\'t allow deactivating DAs when the user is not unlocked" into nyc-dev ...

am: dafec11e69

* commit 'dafec11e698daf054730cfb04db64f3e31a0c9ff':
  Don't allow deactivating DAs when the user is not unlocked

2016-02-16 20:53:03 +00:00

..

java

Merge "Don\'t allow deactivating DAs when the user is not unlocked" into nyc-dev

2016-02-16 20:53:03 +00:00

jni

Frameworks/base: Fix registration function

2016-02-16 10:38:20 -08:00

res

Merge "Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"" into nyc-dev

2016-02-16 17:18:37 +00:00

tests

Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev

2016-02-16 16:11:50 +00:00