| commit | 053ea04255bc3fef757de4dee5f75647bacf258d | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:36:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:39 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 4917c52b5e805d7ed9c3b866797ceba8ac0b81d2 [diff] | |
| parent | 1973a95b9a0699f364c1b5ef9c855333a422c51e [diff] |
am 1973a95b: am 6611894b: (-s ours) am 06d4a385: am 1efeaeee: Merge "Make exclude for jni sources work" into studio-1.4-dev automerge: bad4185 automerge: cff3474 * commit '1973a95b9a0699f364c1b5ef9c855333a422c51e':