tree df6791b56f9c76e38b5ed884e768aa5acffeabc0
parent ac956aac13ce9f32b81c508f1c19e68392a8dd8d
parent 01d49d700e55c3c32b8b1bc2c816be6cc76e6409
author Daniel Sandler <dsandler@google.com> 1262998093 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1262998093 -0800

am 01d49d70: Fix http://b/2352067 .

Merge commit '01d49d700e55c3c32b8b1bc2c816be6cc76e6409'

* commit '01d49d700e55c3c32b8b1bc2c816be6cc76e6409':
  Fix http://b/2352067 .