tree e93094ad8b310f11a5b92b5eb2e84927353f0ec7
parent d72bea9dea10a956bf9b92de71e2dc046e7eae90
parent 099ce51393721424a7cc1fbd29fe59a1970a55ed
author Rich Sloager <rslogar@google.com> 1424211643 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424211643 +0000

am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs

* commit '099ce51393721424a7cc1fbd29fe59a1970a55ed':
  Revert "docs: studio proxy setup"