tree 2f69bc25881808ebed585ec77677551d4e24e13d
parent 570881ef0da58007698fe59d55f8c3ae0104009e
parent b0d0ca38cc8ec11df5becc8c916d8f8a60e83770
author Colin Cross <ccross@android.com> 1525298378 -0700
committer android-build-merger <android-build-merger@google.com> 1525298378 -0700

Merge "Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES"
am: b0d0ca38cc

Change-Id: Ibb10bf34960329a888991f1336d3a6cf145f8eac