tree 1bbc0d88e173f7c630bbdf5d3aa6b8a169cb6a3a
parent 2814b0392009cfb337b705cd73c7dd636ea8382b
parent e148910dfb3f69cdf1a078066724cb32b18e7b8a
author James Dong <jdong@google.com> 1346899957 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346899957 -0700

am e148910d: Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev

* commit 'e148910dfb3f69cdf1a078066724cb32b18e7b8a':
  Fix an issue where the "mFrameCount" field was accessed without its containing object