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:
716c626
9836b64
)
am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
author
Zach Riggle
<riggle@google.com>
Thu, 17 Sep 2015 22:25:53 +0000
(22:25 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 17 Sep 2015 22:25:53 +0000
(22:25 +0000)
* commit '
9836b64f529238d1219f1937abf481383cd0cacd
':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Trivial merge