| commit | ff6b4cb31ef42a537cfabb86614d303441b419ef | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:36:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:36:41 2016 +0000 |
| tree | 358e7a59d8cc2f3be920dde076a85a9b2dc86a1d | |
| parent | fdd183488f11693ff99cd968006689d32a8de091 [diff] | |
| parent | e641695a58378ed8dc5a3d96c3203bebe7cbe362 [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 am: ab4ce73702 * commit 'ab4ce737022e64838ea25a7864a886bc5ab98b8e': debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE