| commit | 99e08b70aa9c2f62159e8eb41860158e75842952 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Oct 29 19:38:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 19:38:05 2014 +0000 |
| tree | f12503fccecbaa0599344194789e9f431dd9074d | |
| parent | 99562bf065234da514338019aaf1085eb7f11ebe [diff] | |
| parent | b5ce284aa8e738de051572ab37a01d52fa7b1dac [diff] |
am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp * commit 'b5ce284aa8e738de051572ab37a01d52fa7b1dac': Remove unused apache related API.