| commit | 43030a19f04c5897b33f3e533f4c71f4fa01ff1c | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:37:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:05 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | ad75552b931bf1a8c4bb9c8828464ceeecda33f9 [diff] | |
| parent | e27d66d0f664b4131d035d9710fa102d55efd070 [diff] |
am e27d66d0: am 36a643f5: (-s ours) am f80049d3: am 8af1f251: Merge "Fix Separate test module dependency." into studio-1.4-dev automerge: 8b7a32b automerge: 9f43f5f * commit 'e27d66d0f664b4131d035d9710fa102d55efd070':