commit | fa40f0072f4eb24d0e2b641bf7b4235e99362c1e | [log] [tgz] |
---|---|---|
author | Rich Slogar <rslogar@google.com> | Tue Feb 17 22:13:37 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 17 22:13:37 2015 +0000 |
tree | 26869ab9e4936bdcc7aa6089373b82a0bb3c77cd | |
parent | a40eb5db455ebb225a7ff0afa244256079d8cf20 [diff] | |
parent | 9c9a3afb95dcac7bf356edf25c8d86187ea59afd [diff] |
am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs * commit '9c9a3afb95dcac7bf356edf25c8d86187ea59afd': docs: studio proxy setting setup docs: studio proxy setup