OSDN Git Service
(root)
/
android-x86
/
hardware-libhardware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
02a5801
608e288
)
Merge remote-tracking branch 'goog/ics-aah-exp'
author
Mike Lockwood
<lockwood@google.com>
Thu, 22 Mar 2012 00:35:00 +0000
(17:35 -0700)
committer
Mike Lockwood
<lockwood@google.com>
Thu, 22 Mar 2012 00:35:04 +0000
(17:35 -0700)
empty -s ours merge
Change-Id: Idccc5a540d4d50ad529fe8d08a49fe55556dd9a8
Trivial merge