| commit | a5d1050b5aca40885769f2f9734d59c1ed1ea0f6 | [log] [tgz] |
|---|---|---|
| author | Siva Velusamy <vsiva@google.com> | Thu Aug 27 21:37:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:13 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 7d6d349090b1852d4a07cf923a0bab4c7d175b12 [diff] | |
| parent | 644027a9dd2f587ad6dcceb979965cb1f1fd6ce2 [diff] |
am 644027a9: am 50f4bd19: (-s ours) am 0e86ef46: am bf8169fc: Merge "Change retention policy of annotations from class to source" into studio-1.4-dev automerge: 6daea43 automerge: dd18cf4 * commit '644027a9dd2f587ad6dcceb979965cb1f1fd6ce2':