diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-12-02 17:17:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 17:17:06 +0000 |
| commit | 874e4502217aa48a06171a7d880b9ca571fd76b1 (patch) | |
| tree | e7a07250c7a00fbef9a4182d1c06946d71f512c7 /core/java/android/net/Proxy.java | |
| parent | 363f0d9fd92129c07d769e43fbc9b46dacc01a3b (diff) | |
| parent | 57457b98cfec197283c42585a3bc4abb1b21d05b (diff) | |
| download | frameworks_base-874e4502217aa48a06171a7d880b9ca571fd76b1.zip frameworks_base-874e4502217aa48a06171a7d880b9ca571fd76b1.tar.gz frameworks_base-874e4502217aa48a06171a7d880b9ca571fd76b1.tar.bz2 | |
am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev
* commit '57457b98cfec197283c42585a3bc4abb1b21d05b':
AudioMix address and type, rule exclusion API, dynamic source
Diffstat (limited to 'core/java/android/net/Proxy.java')
0 files changed, 0 insertions, 0 deletions