| commit | 6319d175906c1a5c88bdafe3cf65674507df2c47 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:28:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:28:03 2016 +0000 |
| tree | 38839867d53dfce7d17033f37ce2100891b6b2e2 | |
| parent | 9b8d01eda9c0c4155642472bbfc32d01e2683946 [diff] | |
| parent | dff7286cd273e66e2a5253822d479bbe61e812ae [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 * commit '77afd985829024a00aef82f0fb1533a6d4294359': Don't create tombstone directory. DO NOT MERGE