OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
324bdf9
6489d6f
)
am 6489d6f6: am 54fa990f: Merge "Fix manifest entry for CAPTIONING_SETTINGS action...
author
Alan Viverette
<alanv@google.com>
Thu, 12 Sep 2013 18:29:05 +0000
(11:29 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 12 Sep 2013 18:29:05 +0000
(11:29 -0700)
* commit '
6489d6f6547f5eb96d9a675ba68fa241ab699b42
':
Fix manifest entry for CAPTIONING_SETTINGS action
Trivial merge