Makoto Onuki 768e087b5a Merge "Don\'t allow deactivating DAs when the user is not unlocked" into nyc-dev am: dafec11e69 ...

am: f56aa71b9f

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

2016-02-16 20:59:43 +00:00

..

android

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

2016-02-16 20:59:43 +00:00

google/android

…