summaryrefslogtreecommitdiff
path: root/rootdir/init.rc
diff options
context:
space:
mode:
authorSergio Giro <sgiro@google.com>2016-07-14 18:50:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-14 18:50:35 +0000
commitc5259155763da5aff3c8a45715c283ce0261dc23 (patch)
tree88fd472c799211f1e6ab921343c7b90510c4831e /rootdir/init.rc
parent385b34e77688339e29401c81069eeb144fee6f93 (diff)
parent8c335e2840d14433d23c7efeba63614d94a61c92 (diff)
Merge \\\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours am: 72bad95df5 am: ae21a25383 am: 1062106a3b am: 9d6d33dba2 -s ours
am: 8c335e2840 Change-Id: I956018c7a1ac4b01f085126260c28328c16c577a
Diffstat (limited to 'rootdir/init.rc')
0 files changed, 0 insertions, 0 deletions