tree c87c3554cfac0ca44484cdf78f81e16820698789
parent b08aa082a400274606093a4b163560cf31914b1c
parent 81831f89ce65ee275652f95322cc167f54da7c85
author Tenghui Zhu <ztenghui@google.com> 1508862988 +0000
committer android-build-merger <android-build-merger@google.com> 1508862988 +0000

Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev
am: 81831f89ce

Change-Id: I0ee4801c31a63b8e617adb053a773456814b65ff