| commit | ab4ce737022e64838ea25a7864a886bc5ab98b8e | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:27:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:27:55 2016 +0000 |
| tree | f0ea1aca79e50ce01d27306e039e32ff0da194d7 | |
| parent | fea11c4d1bdd5c32120960680ae11227ff923cb9 [diff] | |
| parent | 3ddc5e7d6db27925a4f87fdbcb60eebd16e65952 [diff] |
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b am: c663d0482b am: 92e0f8f49d am: 65f7b2d616 am: f25e2dfd3f am: 3ddc5e7d6d * commit '3ddc5e7d6db27925a4f87fdbcb60eebd16e65952': debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE