OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 685e6ce 3581f4c)
am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera...
authorDan Sandler <dsandler@android.com>
Fri, 6 Mar 2015 00:10:22 +0000 (00:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Mar 2015 00:10:22 +0000 (00:10 +0000)
* commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
  Avoid crashing on startup when policy forbids lockscreen camera.


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