| commit | 263b8fb778282e56d020bd39391df78b0f1f2653 | [log] [tgz] |
|---|---|---|
| author | Rich Sloager <rslogar@google.com> | Wed Feb 18 11:13:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 11:13:23 2015 +0000 |
| tree | fabf3e0225a6668d8f9764dce0bb8f30394442e3 | |
| parent | 6c65063aa01cb21ea8c5268db36ce2ee46f2a86f [diff] | |
| parent | 85b066cb8a760ad1a20f7f758c3b7947aea96231 [diff] |
am 85b066cb: am 821bb7fd: am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc * commit '85b066cb8a760ad1a20f7f758c3b7947aea96231': Revert "docs: studio proxy setup"