tree ac3b5775c8e124a196e5723936c36c2f2b8fd67a
parent 1f54026d329693841810439f062de0dcf7ef4a5c
parent 1e3b6338fa9aa10d74e08753ab523111105d5979
author Shinichiro Hamaji <hamaji@google.com> 1450196261 -0800
committer android-build-merger <android-build-merger@google.com> 1450196261 -0800

Merge "Get DCHECK back to EncodedStaticFieldValueIterator" am: 37fcf39935
am: 1e3b6338fa

* commit '1e3b6338fa9aa10d74e08753ab523111105d5979':
  Get DCHECK back to EncodedStaticFieldValueIterator