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:
dfd393a
c6b8503
)
Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\"...
author
Amith Yamasani
<yamasani@google.com>
Tue, 12 Jul 2016 17:57:31 +0000
(17:57 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Jul 2016 17:57:31 +0000
(17:57 +0000)
am:
c6b85035b4
Change-Id: Ib7084c7f4834b682d44e1a6e1c9d71a53a82f438
1
2
core/java/android/app/admin/DevicePolicyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/admin/DevicePolicyManager.java
Simple merge
OSDN Git Service
