tree d0ce492b7a20cbb9d331e340e6db7974f286936c
parent db4f24a6c75e38c21f8c436febabfd5eea6065d8
parent 236cc476e6792a11502ba4f40c7ab4586f40d282
author Dave Burke <daveburke@google.com> 1367863911 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367863911 -0700

am 236cc476: Temporarily revert field name change (DO NOT MERGE)

* commit '236cc476e6792a11502ba4f40c7ab4586f40d282':
  Temporarily revert field name change (DO NOT MERGE)