tree 87469defe41de0c7295b8b80232384a654ed251d
parent 0319896b52f73f4210984510e66841cda4711736
parent dd5487bc83a7f6ce772c1aff70868220df37634b
author Chris Banes <chrisbanes@google.com> 1467320518 +0000
committer android-build-merger <android-build-merger@google.com> 1467320518 +0000

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

Change-Id: I9aa578fc31e9a6cbed36c9f291e7f0e165de5d0d