| commit | b464ce3ecd0ad5d8f3b2b4b4f6823136dcdfbe5d | [log] [tgz] |
|---|---|---|
| author | Michal Bendowski <bendowski@google.com> | Thu Aug 27 21:59:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:59:59 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 3a4469f31f3141ad023388244f210eeb74b9ef40 [diff] | |
| parent | 7680a4a357ce8c555f2bdd97210be8bc7ccec992 [diff] |
am 7680a4a3: 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 '7680a4a357ce8c555f2bdd97210be8bc7ccec992':