tree c77f64aafdab9cc8ac6a5b6eaca7b7001692d45d
parent 5eede8910bec0da7775ab86db0f0e0f7f34180fa
parent 8ef047b97443c9ea8551785ef58ee002cd457b74
author Yigit Boyar <yboyar@google.com> 1470171446 +0000
committer android-build-merger <android-build-merger@google.com> 1470171446 +0000

Merge "Target API check for margin params fix" into nyc-mr1-dev am: 828d4ff61d
am: 8ef047b974

Change-Id: I2deda7bb163746fd2d2b3b17d63b8dfd8e27b7d2