diff options
| author | Josh Gao <jmgao@google.com> | 2016-02-24 21:23:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-24 21:23:55 +0000 |
| commit | adc3bcb1d5e4426273223e0889c7f207abb240f2 (patch) | |
| tree | 93b908c9849f713d6917f708446d30255962e989 /libutils/Unicode.cpp | |
| parent | d61ebb085172200c02af73e030646baf3301028c (diff) | |
| parent | 91b48c37962238e3568d6660aeadfcd4d6eb4207 (diff) | |
resolve merge conflicts of 9515c23e16 to klp-modular-dev
am: 91b48c3796 -s ours
* commit '91b48c37962238e3568d6660aeadfcd4d6eb4207':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
Diffstat (limited to 'libutils/Unicode.cpp')
0 files changed, 0 insertions, 0 deletions