| commit | 512b191d80f01f514789b33d44b64534708ede51 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 21:59:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 21:59:29 2016 +0000 |
| tree | d0753de6b5c62c0b4f61dd96ce9c4f13b2ce634c | |
| parent | c663d0482b67d028e5b30dbe5f45ef7da2b3e5de [diff] | |
| parent | 75708e52d3cced48b4726e71ac94f17cd013ee98 [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 * commit '75708e52d3cced48b4726e71ac94f17cd013ee98': Don't create tombstone directory. DO NOT MERGE