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:
368ae62
26bb7bf
)
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
author
Sudheer Shanka
<sudheersai@google.com>
Thu, 25 Aug 2016 23:07:49 +0000
(23:07 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Aug 2016 23:07:49 +0000
(23:07 +0000)
am:
26bb7bf86c
-s ours
Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61
Trivial merge