| commit | 1eb6ec56c28aae79dadb62e63e245745fe9485a1 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 21:30:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 21:30:37 2016 +0000 |
| tree | 93b908c9849f713d6917f708446d30255962e989 | |
| parent | adc3bcb1d5e4426273223e0889c7f207abb240f2 [diff] | |
| parent | bdfb43146770f631c7097c378c0dbb8e6f8619a1 [diff] |
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours * commit 'bdfb43146770f631c7097c378c0dbb8e6f8619a1': Don't create tombstone directory. DO NOT MERGE