| commit | 01b179bf3b5c4c0307e0efb4004a1c44705fe780 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Jun 25 23:03:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 23:03:02 2014 +0000 |
| tree | 787d845f77cb401fadd697988a320f5cbf2561fd | |
| parent | 0858c65a4d2e9cda9b9a6017bc1f4bf32125cafc [diff] | |
| parent | bb964f00403a23d2f1ec3313f7b579a9e7f0f12a [diff] |
am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build" * commit 'bb964f00403a23d2f1ec3313f7b579a9e7f0f12a': Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build