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
tree: bc9f200f0b2ea889b53f0572d45c176093a6ce78
  1. res/
  2. src/
  3. tests/
  4. proguard.flags