diff options
| author | Rich Slogar <rslogar@google.com> | 2015-02-18 00:30:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-18 00:30:08 +0000 |
| commit | 7a217113d89ecdd38affae241dc722419e819b0e (patch) | |
| tree | 9096c67ac13cabbe87fd592daa41941875f700fa /core/res | |
| parent | 608581022300c82f206749ca01d42f7f17d51d25 (diff) | |
| parent | 65d12bf7f14ff7568cc3011793e219391f9c3d29 (diff) | |
| download | frameworks_base-7a217113d89ecdd38affae241dc722419e819b0e.zip frameworks_base-7a217113d89ecdd38affae241dc722419e819b0e.tar.gz frameworks_base-7a217113d89ecdd38affae241dc722419e819b0e.tar.bz2 | |
am 65d12bf7: am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00
* commit '65d12bf7f14ff7568cc3011793e219391f9c3d29':
docs: studio proxy setting setup
docs: studio proxy setup
Diffstat (limited to 'core/res')
0 files changed, 0 insertions, 0 deletions