| commit | 3a4469f31f3141ad023388244f210eeb74b9ef40 | [log] [tgz] |
|---|---|---|
| author | Fuyao Zhao <fuyaoz@google.com> | Thu Aug 27 21:59:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:59:55 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 72f6ad977c154181d2a252a28e03497042c94b12 [diff] | |
| parent | 00ed826a6aeef70a6572b487da8d68e1c198fd7b [diff] |
am 00ed826a: am 032e3a75: (-s ours) am e6bd1368: am cf17ceb6: Merge "Implement Gradle aware add jetBrains annotation fix." into studio-1.4-dev automerge: 0e32883 automerge: a754c33 * commit '00ed826a6aeef70a6572b487da8d68e1c198fd7b':