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