diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-02-12 20:40:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-12 20:40:28 +0000 |
| commit | 1f26fb175bf3a10b5e1eb495d22778b47400f323 (patch) | |
| tree | 5d673d359757c3b85f0a646c33b14e8eabd56e70 /test/MultiDex | |
| parent | ae7e954bdb0ab23dac8619bbbe7bb5a2bf4fa6d7 (diff) | |
| parent | 41dcb9f856a2051527cd595f8fe7d200066acba4 (diff) | |
Merge changes I41dcb9f8,I8bc80275
* changes:
Revert "Add a script for running art standalone."
Add StandardSocketOptions to the black list.
Diffstat (limited to 'test/MultiDex')
0 files changed, 0 insertions, 0 deletions