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:
f44b48a
7e82d62
)
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
author
Phil Weaver
<pweaver@google.com>
Tue, 18 Jul 2017 21:07:43 +0000
(21:07 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 18 Jul 2017 21:07:43 +0000
(21:07 +0000)
am:
7e82d6204f
-s ours
Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78
Trivial merge