| commit | 49127bddaf29c725f0cbdfe53f33e37afdd3da9f | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 19:51:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 19:51:08 2015 +0000 |
| tree | 7da41e730feea3fd3b2803c01ab321f2170ba189 | |
| parent | eb56f7a5dc66cb0ca54afd25a9d089e7931512df [diff] | |
| parent | 0312d2ff45d895260f0995fc784bea706bd4f13d [diff] |
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 '0312d2ff45d895260f0995fc784bea706bd4f13d':