| commit | 8a7a944fd399dc7f9475b7cc2e06681516156e39 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:06:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:06:23 2016 +0000 |
| tree | 848250357af31d2d3b4e3e48f2b8538169414c80 | |
| parent | 92e0f8f49d952b365b2be7715a4320d2451d7a67 [diff] | |
| parent | 512b191d80f01f514789b33d44b64534708ede51 [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 * commit '512b191d80f01f514789b33d44b64534708ede51': Don't create tombstone directory. DO NOT MERGE