| commit | 0f457184a30ee43406de0da0fdb466e4bbc24df3 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 21:59:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 21:59:21 2016 +0000 |
| tree | 848250357af31d2d3b4e3e48f2b8538169414c80 | |
| parent | a7d5bdb02939f70e32758314287dc3b93989f969 [diff] | |
| parent | da10975de5fc8cb9a1dbfd056f8eebff9ca6f5b7 [diff] |
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b am: c663d0482b * commit 'c663d0482b67d028e5b30dbe5f45ef7da2b3e5de': debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE