| commit | 66a819ade7a9bad80642a221c5d613595ba61b84 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Thu Aug 27 12:15:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:15:18 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | a319973cc216c31b27374ff441ac8dc245c3d212 [diff] | |
| parent | 7ab64464fad16d544454761453ee6f46ff589a1e [diff] |
am 7ab64464: (-s ours) am 5e63d661: am ca6432ca: Merge "Fix extra test runner args command line." into studio-1.3-dev automerge: cce504a -s ours automerge: 9706aa4 automerge: 28e52a7 * commit '7ab64464fad16d544454761453ee6f46ff589a1e':