| commit | a740f41769f88c25cc87db5596c5102a67bbdf31 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:37:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:27 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 1a9b2813c7cfdf539f779d1f9814fe35d14e590d [diff] | |
| parent | a4cafb5e96ceed76b29448727da4eb2131ef67d8 [diff] |
am a4cafb5e: am 62e6a8a0: (-s ours) am 85b7d557: am 1c2fc48e: Merge "Fix Separate test module dependency." into studio-1.3-dev automerge: 1014a96 automerge: 56d4131 automerge: f517e02 * commit 'a4cafb5e96ceed76b29448727da4eb2131ef67d8':