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:
c738e48
ce2e9d8
)
Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io...
author
Aurimas Liutikas
<aurimas@google.com>
Tue, 14 Jun 2016 00:57:18 +0000
(
00:57
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 14 Jun 2016 00:57:18 +0000
(
00:57
+0000)
am:
ce2e9d8716
Change-Id: I90462329a4fbdd264714c653b0df30cbc9f4f866
1
2
docs/html/guide/topics/manifest/activity-element.jd
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
docs/html/guide/topics/manifest/activity-element.jd
Simple merge