OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0c9742d
4f24f21
)
DO NOT MERGE Add bound checks to utf16_to_utf8 am: 0d9d569c26 am: edce8ad060
author
Sergio Giro
<sgiro@google.com>
Thu, 14 Jul 2016 18:03:12 +0000
(18:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 14 Jul 2016 18:03:12 +0000
(18:03 +0000)
am:
4f24f218dc
-s ours
Change-Id: I087fe456765f1129a8697604be2f6e47243446f9
Trivial merge