tree ba8d5597ee1669d3ed68a86f4b48986748f2ebc3
parent 0e57034afda4492b602d450c4ab4240e8e1d26d8
parent 894ce60a9f39c709c52c3405ef0e29d7bea93217
author Dianne Hackborn <hackbod@google.com> 1449535063 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1449535063 +0000

Merge "Fix issue #25656837: Static initialization order bug in ArrayMap leading to NPEs"