| commit | 6e56ad05d86eca8f29ddba5a4b582e38396a6d51 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Thu Jun 30 21:11:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:11:01 2016 +0000 |
| tree | f69f432a9066d863ba36133d3d201fb01a1bce7d | |
| parent | 4c35318ec3c125604e3b8a0e6be9aad86cb7a2cc [diff] | |
| parent | 270800e7ec9f917c6c96fb875da27fbf4eab4386 [diff] |
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