| commit | 3a69c24fcaa01f276b5a77e05487f9614c3ae246 | [log] [tgz] |
|---|---|---|
| author | Rich Sloager <rslogar@google.com> | Wed Feb 18 00:18:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 00:18:01 2015 +0000 |
| tree | 6a683a4d66660b10b4ceac3a98676ea19afdf71c | |
| parent | 6de1fd98f73b94c8bd5508b3e3d419d0b5d19621 [diff] | |
| parent | dcf68e83d6868abb6334c7a1881724f04929e87c [diff] |
am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc * commit 'dcf68e83d6868abb6334c7a1881724f04929e87c': Revert "docs: studio proxy setup"