| commit | 75708e52d3cced48b4726e71ac94f17cd013ee98 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 21:46:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 21:46:12 2016 +0000 |
| tree | 6208877fee586a8daad8a2b3f795182fe7f1f078 | |
| parent | b97b07e55b4ef4312870398bf658b30b41103403 [diff] | |
| parent | 9cde3091033bc367690aa65b814650cdc0e284fe [diff] |
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 am: 9cde309103 -s ours * commit '9cde3091033bc367690aa65b814650cdc0e284fe': Don't create tombstone directory. DO NOT MERGE