tree 84deb9db0e20202797272ba1ef70e37c4933242e
parent f711547fbc55350cf6bb320e2c5ee34ca12e4bc8
parent a58ff1dd874d8dddf2385ccdcb98c522ff591b14
author Chris Banes <chrisbanes@google.com> 1477930827 +0000
committer android-build-merger <android-build-merger@google.com> 1477930827 +0000

Merge "Preserve left+right compound drawables" into nyc-mr1-dev
am: a58ff1dd87

Change-Id: Ia9114921103cfd62aa0452f9a9564a0c7897efe0