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