OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e0936e f56aa71)
Merge "Don\'t allow deactivating DAs when the user is not unlocked" into nyc-dev...
authorMakoto Onuki <omakoto@google.com>
Tue, 16 Feb 2016 20:59:43 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Feb 2016 20:59:43 +0000 (20:59 +0000)
am: f56aa71b9f

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


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help