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