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:
e7e3f06
caafb1f
)
Merge "Refactor TISM add/remove code" into oc-dev am: c0af382a25 -s ours
author
Erik Kline
<ek@google.com>
Thu, 22 Jun 2017 14:06:59 +0000
(14:06 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 22 Jun 2017 14:06:59 +0000
(14:06 +0000)
am:
caafb1fbe3
-s ours
Change-Id: Ied5003b52d758618cdaa4900a9e36845cebf7e66
Trivial merge