commit | 8cfde56105fa3187220f1c426c4fe63ed6e3b1ba | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Fri Sep 22 20:56:41 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 22 20:56:41 2017 +0000 |
tree | 592076e9ec4cde144954864fb758c619d049181d | |
parent | 6b261e5b2249d159217aabf95d215a32f6203989 [diff] | |
parent | 0b42833ae3b4da3664c1d6f6b888879f184da12d [diff] |
Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" am: 7d607a1917 am: 0b42833ae3 Change-Id: I9a535f635da245473130345643e1e0b0250885df