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:
ef129d8
c667f05
)
am c667f054: am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration...
author
Craig Mautner
<cmautner@google.com>
Thu, 6 Feb 2014 22:17:28 +0000
(14:17 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 6 Feb 2014 22:17:28 +0000
(14:17 -0800)
* commit '
c667f054d5b5a87247cd84d78d483dc1c97af41a
':
DO NOT MERGE. Test for Configuration differences before changing.
Trivial merge