| commit | 6490ad4ae5033a3fc563c63a5aa94d435e0da351 | [log] [tgz] |
|---|---|---|
| author | Rich Slogar <rslogar@google.com> | Tue Feb 17 22:35:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 17 22:35:56 2015 +0000 |
| tree | 7fc7da601c57f6a521387b2d5be675b87c97c9ae | |
| parent | c987508df752bca2cf6f2ce87d4047a7b4541aa3 [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