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:
3de8df7
67cb5f5
)
Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37
author
Jeff Sharkey
<jsharkey@google.com>
Tue, 6 Jun 2017 16:17:39 +0000
(16:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 6 Jun 2017 16:17:39 +0000
(16:17 +0000)
am:
67cb5f5210
Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216
1
2
Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/app/admin/DevicePolicyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
telecomm/java/android/telecom/TelecomManager.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/TelephonyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Android.mk
Simple merge
diff --cc
core/java/android/app/admin/DevicePolicyManager.java
Simple merge
diff --cc
telecomm/java/android/telecom/TelecomManager.java
Simple merge
diff --cc
telephony/java/android/telephony/TelephonyManager.java
Simple merge
OSDN Git Service
