| commit | d75a68339af547b89068e1e4fe78d34c9b11f38e | [log] [tgz] |
|---|---|---|
| author | Rich Sloager <rslogar@google.com> | Tue Feb 17 22:20:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 17 22:20:43 2015 +0000 |
| tree | e93094ad8b310f11a5b92b5eb2e84927353f0ec7 | |
| parent | d72bea9dea10a956bf9b92de71e2dc046e7eae90 [diff] | |
| parent | 099ce51393721424a7cc1fbd29fe59a1970a55ed [diff] |
am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs * commit '099ce51393721424a7cc1fbd29fe59a1970a55ed': Revert "docs: studio proxy setup"