diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-11-30 18:15:01 -0800 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-11-30 18:34:56 -0800 |
| commit | f3b4f3163b5b4c0a54a2643f07c97c47b14a1eb7 (patch) | |
| tree | 5f3f38a66623e5481c16fb7bfbae0ee122da6532 /core/java/android/util | |
| parent | a90d65265fe94e35967876500105d6e020ce0f91 (diff) | |
| parent | 26f7a81f40a16c45cd9b8b7df48a3d948e5793c6 (diff) | |
| download | frameworks_base-f3b4f3163b5b4c0a54a2643f07c97c47b14a1eb7.zip frameworks_base-f3b4f3163b5b4c0a54a2643f07c97c47b14a1eb7.tar.gz frameworks_base-f3b4f3163b5b4c0a54a2643f07c97c47b14a1eb7.tar.bz2 | |
resolved conflicts for merge of 26f7a81f to master
Change-Id: I6bf5fd7c0de7945cef84602dbe3a7bbed587700f
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/SparseArray.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/util/SparseArray.java b/core/java/android/util/SparseArray.java index 7cf4579..366abd3 100644 --- a/core/java/android/util/SparseArray.java +++ b/core/java/android/util/SparseArray.java @@ -134,6 +134,7 @@ public class SparseArray<E> implements Cloneable { if (i != o) { keys[o] = keys[i]; values[o] = val; + values[i] = null; } o++; |