| commit | e03b1b3a201e4bd3e26ab4ece9bab895fd0adaf6 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Thu Jun 30 21:09:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:09:49 2016 +0000 |
| tree | f69f432a9066d863ba36133d3d201fb01a1bce7d | |
| parent | b6211f7cf5096b918d7af1ad82ffcd30119c45d7 [diff] | |
| parent | 13b5f643198d54a3ccbdc7f405a814827dfcea67 [diff] |
Merge \"Merge \\\"Fix use of API 19+ FrameLayout LP constructor DO NOT MERGE ANYWHERE\\\" into nyc-dev am: dd5487bc83 -s ours am: f0980b3795 -s ours\" into nyc-mr1-dev-plus-aosp am: 13b5f64319 -s ours Change-Id: If7ee5d0956ade88c5eb3e6e189552db079d5b847