OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ac35ad3
3581f4c
)
am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera...
author
Dan Sandler
<dsandler@android.com>
Fri, 6 Mar 2015 00:10:10 +0000
(
00:10
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 6 Mar 2015 00:10:10 +0000
(
00:10
+0000)
* commit '
3581f4c91a77ecb9313f51a2d07ed88ff61d9299
':
Avoid crashing on startup when policy forbids lockscreen camera.
Trivial merge