diff options
| author | Baligh Uddin <baligh@google.com> | 2014-10-31 17:07:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 17:07:17 +0000 |
| commit | 9ce5f3d3da76ad628de1b6c4f155b7b543f35581 (patch) | |
| tree | 94d7f812cb06f99e8d011a8be17e0cfba9b22e35 /core/java/android/net/Proxy.java | |
| parent | 4203242f223084fa8bd4459fa60e95be4dae659e (diff) | |
| parent | 8db41fe7b04e071e08cb11d8367307d5d0ac44fc (diff) | |
| download | frameworks_base-9ce5f3d3da76ad628de1b6c4f155b7b543f35581.zip frameworks_base-9ce5f3d3da76ad628de1b6c4f155b7b543f35581.tar.gz frameworks_base-9ce5f3d3da76ad628de1b6c4f155b7b543f35581.tar.bz2 | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Diffstat (limited to 'core/java/android/net/Proxy.java')
0 files changed, 0 insertions, 0 deletions