diff options
| author | Luan Nguyen <luann@google.com> | 2014-12-02 17:25:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 17:25:31 +0000 |
| commit | 3a8d6c8086d63d6ad38e1af821c66d892a2e6759 (patch) | |
| tree | aae84a2c1bf32e67247905f3a5e8a5c874390f06 /core/java/android/net/Proxy.java | |
| parent | 8e74a8a77e06c93180a5b807c3d9865c89be3dc7 (diff) | |
| parent | a7ee124305de16fa3acecbb087c0b0cbb1bc649b (diff) | |
| download | frameworks_base-3a8d6c8086d63d6ad38e1af821c66d892a2e6759.zip frameworks_base-3a8d6c8086d63d6ad38e1af821c66d892a2e6759.tar.gz frameworks_base-3a8d6c8086d63d6ad38e1af821c66d892a2e6759.tar.bz2 | |
am a7ee1243: am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs
* commit 'a7ee124305de16fa3acecbb087c0b0cbb1bc649b':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.
Diffstat (limited to 'core/java/android/net/Proxy.java')
0 files changed, 0 insertions, 0 deletions