diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-04-28 15:12:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-28 15:12:57 +0000 |
| commit | 6e0272aeee594269f50c265b71eeee202c9a00d8 (patch) | |
| tree | 98f0dda13a2502ad25691498483002ed570757df /core/java/android/widget/LinearLayout.java | |
| parent | 98d75a2cb60030c8e792c39306f3ba22a187c6b5 (diff) | |
| parent | bcb402b2108a3dcf43d5753b9d68dc831a54b743 (diff) | |
Merge "Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa am: ee1bb34" into nyc-mr1-dev-plus-aosp
am: bcb402b
* commit 'bcb402b2108a3dcf43d5753b9d68dc831a54b743':
Change-Id: I19e1b945c74385eab7acb80a716956f98fa3bc9c
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
0 files changed, 0 insertions, 0 deletions