tree a20672adc6e6dbd474b1cd4efd644e1840cf4575
parent b17f384dd74f42f68ae1f20091fdb67cce1dc0d7
parent 43641b5e1f9a9b2c7dcbe6fd2098a59f37511d9e
author Colin Cross <ccross@android.com> 1525384045 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525384045 +0000

Merge changes from topic "soong_support_lib_pi_dev_prereqs" into pi-dev

* changes:
  Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES
  Allow Soong to export multiple proguard flags files
  Fix echo when copying package-res.apk
  Allow soong java libraries to include exported resources and proguard flags