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:
d2699d0
105b0ff
)
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
author
Fyodor Kupolov
<fkupolov@google.com>
Fri, 10 Mar 2017 02:03:16 +0000
(
02:03
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 10 Mar 2017 02:03:16 +0000
(
02:03
+0000)
am:
105b0ff30c
-s ours
Change-Id: Iec5bbb651da033182ec99e9b10e10c098724a5a0
Trivial merge