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:
ce8337a
d2e6a62
)
Merge \"Merge \\"Include new constant for encryption status in the getter\\'s javadoc...
author
Amith Yamasani
<yamasani@google.com>
Tue, 12 Jul 2016 17:55:05 +0000
(17:55 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Jul 2016 17:55:05 +0000
(17:55 +0000)
am:
d2e6a62838
Change-Id: I5d11b5f95bab3f5b581f0fab176efc5c349adb55
Trivial merge