| commit | 821bb7fdef6ae983a9c90ee9c763b941eba662a5 | [log] [tgz] |
|---|---|---|
| author | Rich Sloager <rslogar@google.com> | Wed Feb 18 00:25:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 00:25:20 2015 +0000 |
| tree | 5ce411e2adcde5567f58ba40a3f5a0f895ad693e | |
| parent | 9f807e7ef2793e02b592afa33d73633bb9343c4c [diff] | |
| parent | 3a69c24fcaa01f276b5a77e05487f9614c3ae246 [diff] |
am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc * commit '3a69c24fcaa01f276b5a77e05487f9614c3ae246': Revert "docs: studio proxy setup"