| commit | 1b45a1d9642bfda9113899d509096b718cf1f6dd | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Fri Jul 18 13:29:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 13:29:30 2014 +0000 |
| tree | 51b98f458760a87793f9accf86c5948171488ce8 | |
| parent | bf04e111a6a577cbc43e0362f43369a237078314 [diff] | |
| parent | a7aa5e0e866a0a6c82e8673d642be490aeecc0f1 [diff] |
am a7aa5e0e: (-s ours) am 2d2ce1b6: Merge "Add res folder to multidex SDK projects." * commit 'a7aa5e0e866a0a6c82e8673d642be490aeecc0f1': Add res folder to multidex SDK projects.