| commit | f70b150c683673ffff2b912f5e14d835e616daeb | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 12:14:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:14:45 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 1973a95b9a0699f364c1b5ef9c855333a422c51e [diff] | |
| parent | abdc5a79b2db769b5522af24151697a96b13fc30 [diff] |
am abdc5a79: (-s ours) am 0144ca1e: am 1760ec4d: Merge "Fix dependencies of NDK tasks" into studio-1.4-dev automerge: c32f199 automerge: 8595ae8 * commit 'abdc5a79b2db769b5522af24151697a96b13fc30':