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:
1fbc4b8
117a383
)
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
author
Amith Yamasani
<yamasani@google.com>
Thu, 25 Aug 2016 23:07:46 +0000
(23:07 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Aug 2016 23:07:46 +0000
(23:07 +0000)
am:
117a383099
-s ours
Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb
Trivial merge