| commit | f6536309c35dfafb4f4e6f511239a5d5c9958178 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Thu Aug 27 21:37:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:01 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | e4e8baf256c1c05b6f65b6f128294372643b5219 [diff] | |
| parent | 66a819ade7a9bad80642a221c5d613595ba61b84 [diff] |
am 66a819ad: 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 '66a819ade7a9bad80642a221c5d613595ba61b84':