| commit | f6c9a6a2d77b99233999138209a3b26622c062dc | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Thu Aug 27 21:37:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:43 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | c2746476cce4eb2fdbf3df01b1d4c77fd2140356 [diff] | |
| parent | 501805ba491e8359f097ebcf568dd53405ba3525 [diff] |
am 501805ba: am 102518d9: (-s ours) am c2b92d6e: am c6cc7439: Merge "Jack and Jill API version 0.9" into studio-1.4-dev automerge: 2f93e5b automerge: baae147 * commit '501805ba491e8359f097ebcf568dd53405ba3525':