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:
8ac1bff
54de774
)
Fix @links in reference docs.
author
Elliot Waite
<elliotwaite@google.com>
Thu, 26 Jan 2017 04:34:57 +0000
(
04:34
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 26 Jan 2017 04:34:57 +0000
(
04:34
+0000)
am:
54de77470d
Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
1
2
core/java/android/app/Activity.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/app/ActivityManager.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/view/View.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/attrs.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/Activity.java
Simple merge
diff --cc
core/java/android/app/ActivityManager.java
Simple merge
diff --cc
core/java/android/view/View.java
Simple merge
diff --cc
core/res/res/values/attrs.xml
Simple merge