commit | 15e15a07f02da5d919993cdba68ea1b54d02a91c | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Fri Sep 22 21:00:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 22 21:00:13 2017 +0000 |
tree | c77aff90dda017e94d8f7ac0b9f386ab91a30306 | |
parent | 4d500468242c6621c8e10cc3694cbb96acf23bce [diff] | |
parent | 8cfde56105fa3187220f1c426c4fe63ed6e3b1ba [diff] |
Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" am: 7d607a1917 am: 0b42833ae3 am: 8cfde56105 Change-Id: I050e493b16ea38e011b6c7ec7142bad0c7ab1886