summaryrefslogtreecommitdiff
path: root/core/java/android/widget/LinearLayout.java
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2016-04-28 15:12:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-28 15:12:54 +0000
commit98d75a2cb60030c8e792c39306f3ba22a187c6b5 (patch)
tree98f0dda13a2502ad25691498483002ed570757df /core/java/android/widget/LinearLayout.java
parentc8b49a8348d929e284c0f4e52217cb2c82add13b (diff)
parente5231fed951f0ad24fe58604c56c4177d3d00902 (diff)
Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa am: b3324b4
am: e5231fe * commit 'e5231fed951f0ad24fe58604c56c4177d3d00902': Properly parcel HdrCapabilities. Change-Id: I4b8cd07da559ce0ecef1ac48b6d2f4a58711a859
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
0 files changed, 0 insertions, 0 deletions