| commit | aa0afa65c573cbc30ed6afb795b27b12a2f29b31 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:14:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:14:53 2016 +0000 |
| tree | 635c5e2a191cae8c2262b29fed22d483e1dadedd | |
| parent | 65f7b2d6169a2a61fe1d607ca55e690721faf31a [diff] | |
| parent | 8a7a944fd399dc7f9475b7cc2e06681516156e39 [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 * commit '8a7a944fd399dc7f9475b7cc2e06681516156e39': Don't create tombstone directory. DO NOT MERGE