| commit | 46feee09fafcc379b3328dd6a14a1c2936890785 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:42:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:42:30 2016 +0000 |
| tree | 358e7a59d8cc2f3be920dde076a85a9b2dc86a1d | |
| parent | ff6b4cb31ef42a537cfabb86614d303441b419ef [diff] | |
| parent | e8c9c746418fa1389b555168e4b7653f0b662508 [diff] |
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 am: 9cde309103 -s ours am: 75708e52d3 am: 512b191d80 -s ours am: 8a7a944fd3 am: aa0afa65c5 am: 77afd98582 am: 8e3e7e9f97 -s ours am: b236ff7156 * commit 'b236ff71562ab93a5474831edb9c8dced309ea74': Don't create tombstone directory. DO NOT MERGE