OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ab52546
75f912c
)
am 75f912ca: am dd309b97: Merge "Handle the case where an asynchronous prepare was...
author
Andreas Huber
<andih@google.com>
Thu, 25 Apr 2013 23:57:31 +0000
(16:57 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 25 Apr 2013 23:57:31 +0000
(16:57 -0700)
* commit '
75f912ca9d8a03c91a421b80d96b81d87ef79d68
':
Handle the case where an asynchronous prepare was initiated and then
Trivial merge