| commit | 7680a4a357ce8c555f2bdd97210be8bc7ccec992 | [log] [tgz] |
|---|---|---|
| author | Michal Bendowski <bendowski@google.com> | Thu Aug 27 11:16:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:00 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 00ed826a6aeef70a6572b487da8d68e1c198fd7b [diff] | |
| parent | 3399d618273a61a1b7559989f2382d5ad37eae50 [diff] |
am 3399d618: (-s ours) am 72b47342: am 9ab04059: Merge "Regenerate sources/mockable jars on project rebuild." into studio-1.4-dev automerge: ffcf4b0 automerge: 09ca8a3 * commit '3399d618273a61a1b7559989f2382d5ad37eae50':