tree c488feec0b6564a6e53b33081dd55a0e27edc44f
parent 45b0e7788426634b48c67765631e7bcb884c0fac
parent e7df20972b910d168bab043e08a34f83ef89d22d
author Ta-wei Yen <twyen@google.com> 1452285796 +0000
committer android-build-merger <android-build-merger@google.com> 1452285796 +0000

Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap
am: b1d3cff91f  -s ours

* commit 'b1d3cff91f5fc15c7f75c9bef8928101d7bb33d5':
  Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap