diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 19:46:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 19:46:00 +0000 |
| commit | 0312d2ff45d895260f0995fc784bea706bd4f13d (patch) | |
| tree | 006ae6ee2e87de03bf7a2145fa94add644bca76d | |
| parent | 4c2a6fddb10a8b4c00391d54371aaa14f5d901ce (diff) | |
| parent | 320f505ed52f8970b08eb93766af831de0332415 (diff) | |
| download | frameworks_base-0312d2ff45d895260f0995fc784bea706bd4f13d.zip frameworks_base-0312d2ff45d895260f0995fc784bea706bd4f13d.tar.gz frameworks_base-0312d2ff45d895260f0995fc784bea706bd4f13d.tar.bz2 | |
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 '320f505ed52f8970b08eb93766af831de0332415':
0 files changed, 0 insertions, 0 deletions