tree f69f432a9066d863ba36133d3d201fb01a1bce7d
parent 4c35318ec3c125604e3b8a0e6be9aad86cb7a2cc
parent 270800e7ec9f917c6c96fb875da27fbf4eab4386
author Chris Banes <chrisbanes@google.com> 1467321061 +0000
committer android-build-merger <android-build-merger@google.com> 1467321061 +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
am: 270800e7ec  -s ours

Change-Id: Ib7f9233a60048c41f58cdbcdde13263302c3c98d