| commit | b236ff71562ab93a5474831edb9c8dced309ea74 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:34:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:34:55 2016 +0000 |
| tree | f0ea1aca79e50ce01d27306e039e32ff0da194d7 | |
| parent | ab4ce737022e64838ea25a7864a886bc5ab98b8e [diff] | |
| parent | 8e3e7e9f97867a2e35e91c3c8733f86d5b387f4d [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 * commit '8e3e7e9f97867a2e35e91c3c8733f86d5b387f4d': Don't create tombstone directory. DO NOT MERGE