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:
0946c26
de2557f
)
Fix @links in reference docs. am: 54de77470d am: ab978c035e
author
Elliot Waite
<elliotwaite@google.com>
Thu, 26 Jan 2017 04:44:56 +0000
(
04:44
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 26 Jan 2017 04:44:56 +0000
(
04:44
+0000)
am:
de2557f369
Change-Id: I3d4637ec03906dd520edaeadecdfe2fd4faa471b
1
2
core/java/android/content/Context.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/view/View.java
patch
|
diff1
|
diff2
|
blob
|
history
media/java/android/media/AudioManager.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/CarrierConfigManager.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/TelephonyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/content/Context.java
Simple merge
diff --cc
core/java/android/view/View.java
Simple merge
diff --cc
media/java/android/media/AudioManager.java
Simple merge
diff --cc
telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
diff --cc
telephony/java/android/telephony/TelephonyManager.java
Simple merge