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:
2c6f342
e6373ad
)
Merge \\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\" into lmp-dev am: 5f34f...
author
Sergio Giro
<sgiro@google.com>
Thu, 14 Jul 2016 18:03:15 +0000
(18:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 14 Jul 2016 18:03:15 +0000
(18:03 +0000)
am:
e6373adbec
-s ours
Change-Id: I451066bdcc955ad76e81f1650f1583b5b560a094
Trivial merge