| commit | 2b29d96f0718f55429d0140ef9227310f42b228a | [log] [tgz] |
|---|---|---|
| author | Rich Slogar <rslogar@google.com> | Tue Feb 17 22:36:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 17 22:36:02 2015 +0000 |
| tree | d98e1a46a47d2c06f59cf0665f46454b5dd54028 | |
| parent | 1289d522986e44c681bae020cb6dffe1d563b1ed [diff] | |
| parent | 82510fa5a63114e75c0ed154120e0ca92d401524 [diff] |
am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00 * commit '82510fa5a63114e75c0ed154120e0ca92d401524': docs: studio proxy setting setup docs: studio proxy setup