| commit | dff7286cd273e66e2a5253822d479bbe61e812ae | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:21:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:21:02 2016 +0000 |
| tree | edb4bdafaa0de5eef6cba00ba6b9188b7c935889 | |
| parent | 8f621db57bd89bcf5e6ba135ebaa012c61078abd [diff] | |
| parent | 3e88ae8ae01c8be54097f19b80229c31ff3cd4b7 [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 * commit 'aa0afa65c573cbc30ed6afb795b27b12a2f29b31': Don't create tombstone directory. DO NOT MERGE