tree bc9f200f0b2ea889b53f0572d45c176093a6ce78
parent ede2f7e1f790a97db95f6d34f54e2839005b88ef
parent a94a1179714f6a79a6d9d7ae542458b8e6d742e7
author Ta-wei Yen <twyen@google.com> 1452625045 +0000
committer android-build-merger <android-build-merger@google.com> 1452625045 +0000

DO NOT MERGE Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap
am: a94a117971

* commit 'a94a1179714f6a79a6d9d7ae542458b8e6d742e7':
  DO NOT MERGE Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap