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:
d2d4fa7
e197034
)
am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if...
author
Amith Yamasani
<yamasani@google.com>
Fri, 17 Oct 2014 19:14:06 +0000
(19:14 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 17 Oct 2014 19:14:06 +0000
(19:14 +0000)
* commit '
e1970346a43109a9bcf4037135425a918fc953d3
':
Use the correct method to check if device is encrypted
Trivial merge