OSDN Git Service

am 3ac22f7a: am 49127bdd: am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am...
authorJon Larimer <jlarimer@google.com>
Thu, 29 Jan 2015 20:03:25 +0000 (20:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 20:03:25 +0000 (20:03 +0000)
commit293b7b4fe510bf7df879e89bf748c0b8695f4310
tree70003cff836496bf1001e1ea8ef3a6cd3544a705
parent44f389c4f95244a5c3b3e232145a5c337f18fe77
parent3ac22f7a386317ed4affe5bca0406501726ddb73
am 3ac22f7a: am 49127bdd: am 0312d2ff: am 320f505e: am 52fba8d1: 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 automerge: bebfd58

* commit '3ac22f7a386317ed4affe5bca0406501726ddb73':