| commit | e16871a1d50ff7863d31fa1109de4c51c5cf830e | [log] [tgz] |
|---|---|---|
| author | Michal Bendowski <bendowski@google.com> | Thu Aug 27 21:36:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:18 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 67292d19b37b97466c931c9ef4f4eaa681d348cc [diff] | |
| parent | f1d0663654216346ac6319aa0c6299fdb5963a58 [diff] |
am f1d06636: am e8e9be33: (-s ours) am c4dfe315: am 345a97cc: Merge "Share the mockable JAR between subprojects." into studio-1.4-dev automerge: 20f40e3 automerge: 6d4d84d * commit 'f1d0663654216346ac6319aa0c6299fdb5963a58':