diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 18:25:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 18:25:28 +0000 |
| commit | a5ccca242747d59233ec5ecebc20d4a721e7850e (patch) | |
| tree | cbe20df65bb8f42a0d190847715af13ef7288e5e /core/java/android/net/LinkAddress.java | |
| parent | 6813f29e3247f0567b77fe7eb451215b5fadf67b (diff) | |
| parent | 2982d64802ed0d5b59130680c43485e9d7862e50 (diff) | |
| download | frameworks_base-a5ccca242747d59233ec5ecebc20d4a721e7850e.zip frameworks_base-a5ccca242747d59233ec5ecebc20d4a721e7850e.tar.gz frameworks_base-a5ccca242747d59233ec5ecebc20d4a721e7850e.tar.bz2 | |
am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Diffstat (limited to 'core/java/android/net/LinkAddress.java')
0 files changed, 0 insertions, 0 deletions