tree adafbe6ca9d526febd13c44178317188cbeec1ab
parent 9b3519639d22eef1cddff88f3f8ba453b959156a
parent 96da53b1bd58749fd9ae7b87967f26c5fd8eee55
author Android Build Merger (Role) <android-build-merger@google.com> 1467320747 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467320747 +0000

Merge "Merge \\"Fix use of API 19+ FrameLayout LP constructor DO NOT MERGE ANYWHERE\\" into nyc-dev am: dd5487bc83  -s ours am: 82a0ac637f  -s ours" into nyc-mr1-dev-plus-aosp