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:
1e6d3f9
de9cb7e
)
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
author
Fyodor Kupolov
<fkupolov@google.com>
Fri, 10 Mar 2017 03:06:31 +0000
(
03:06
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 10 Mar 2017 03:06:31 +0000
(
03:06
+0000)
am:
de9cb7ed68
-s ours
Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab
Trivial merge