diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-03 12:52:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-03 12:52:14 +0000 |
| commit | 4a51d06402ae59b49cf0e99d05a82f71500ffe08 (patch) | |
| tree | 3c6946b1f90acaca10d335c0a04eb49e28d71460 /core/java/android/net/Proxy.java | |
| parent | 082f49786ec25b254992781a5ad3c67e75ceb8ee (diff) | |
| parent | 726e9ea7322d5122a22a0077d58ae92870962df4 (diff) | |
| download | frameworks_base-4a51d06402ae59b49cf0e99d05a82f71500ffe08.zip frameworks_base-4a51d06402ae59b49cf0e99d05a82f71500ffe08.tar.gz frameworks_base-4a51d06402ae59b49cf0e99d05a82f71500ffe08.tar.bz2 | |
am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
automerge: 726e9ea
* commit '726e9ea7322d5122a22a0077d58ae92870962df4':
Fix getPackageInfo("android") in the system server.
Diffstat (limited to 'core/java/android/net/Proxy.java')
0 files changed, 0 insertions, 0 deletions