tree 85887d54f4187c51c48843190cec7e7404220e9f
parent 63577d9280e7919bfb7221030d211b833e66bb1e
parent 032be7a4c5be8c015063084d162d1f394279aa3d
author Colin Cross <ccross@android.com> 1367381548 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367381548 -0700

am 032be7a4: Merge "Log an error if property pool is exhausted"

* commit '032be7a4c5be8c015063084d162d1f394279aa3d':
  Log an error if property pool is exhausted