tree 9b55baf72ae63d2c30365bbfb7aadc8d8fe890e7
parent 313795532363eea2c2479c5d1f90505a473610a2
parent a246c6a84a8535ffca98b6c59b23a8d58a818f4d
author Søren Gjesse <sgjesse@google.com> 1523949195 -0700
committer android-build-merger <android-build-merger@google.com> 1523949195 -0700

Merge "Keep the collected Proguard configuration" am: 0c2a796853
am: a246c6a84a

Change-Id: I2eae581750bdb3fa51649c7b130e3169fa80877f