| commit | 3ac22f7a386317ed4affe5bca0406501726ddb73 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 19:56:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 19:56:45 2015 +0000 |
| tree | a0c3ff70b6a365bc911f442c8d867a80892a7ac2 | |
| parent | ca04fca501aa1b3ca979bd860bb722ba3e3e0662 [diff] | |
| parent | 49127bddaf29c725f0cbdfe53f33e37afdd3da9f [diff] |
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 '49127bddaf29c725f0cbdfe53f33e37afdd3da9f':