tree a5f57e95257e70aeec65a66b119d0594ee59e316
parent 66b6a3e77c37b785be4c6ab5d4f956732c9d2784
parent 45525258b10e0182e4e0c9fa82275162053c121b
author Colin Cross <ccross@android.com> 1525298594 -0700
committer android-build-merger <android-build-merger@google.com> 1525298594 -0700

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

Change-Id: Id1ec46833aae7aa339735d51c44a3e0d971f901b