summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/LinearLayout.java
diff options
context:
space:
mode:
authorJon Larimer <jlarimer@google.com>2015-01-29 18:12:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 18:12:01 +0000
commit2982d64802ed0d5b59130680c43485e9d7862e50 (patch)
tree2d45591cbb74b85eacb54954bbd8950c9aff8736 /core/java/android/widget/LinearLayout.java
parent76cdbb0475fe881c8e7320c277e5ea4848be5bff (diff)
parentde9a76ed997c300a6c5f2f82c517719503af9045 (diff)
downloadframeworks_base-2982d64802ed0d5b59130680c43485e9d7862e50.zip
frameworks_base-2982d64802ed0d5b59130680c43485e9d7862e50.tar.gz
frameworks_base-2982d64802ed0d5b59130680c43485e9d7862e50.tar.bz2
am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045': Fix ParceledListSlice to enforce the same concrete types among its elements.
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
0 files changed, 0 insertions, 0 deletions