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
28ba472
)
Fix @links in reference docs. am: 54de77470d am: ab978c035e
author
Elliot Waite
<elliotwaite@google.com>
Thu, 26 Jan 2017 04:44:54 +0000
(
04:44
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 26 Jan 2017 04:44:54 +0000
(
04:44
+0000)
am:
28ba4722a9
Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b
1
2
core/java/android/app/ActivityManager.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/widget/RemoteViews.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/vr/VrManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/CarrierConfigManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/ActivityManager.java
Simple merge
diff --cc
core/java/android/widget/RemoteViews.java
Simple merge
diff --cc
services/core/java/com/android/server/vr/VrManagerService.java
Simple merge
diff --cc
telephony/java/android/telephony/CarrierConfigManager.java
Simple merge