tree c27a474b9d4ab0fe8ae00520742ef977c97b66cf
parent 6fe42f08702a0773c0dd2aad2d41c54f73bb057b
parent ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1
author Jon Larimer <jlarimer@google.com> 1422557725 +0000
committer android-build-merger <android-build-merger@google.com> 1422557725 +0000

am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
automerge: ea63fd7

* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.