tree c6c7e3a8ac5ff260f9823e2c774ccd721f27b92c
parent bcea8124a1d85c610b4bd4e6d360a861d2f61793
parent 8978547f254b6b6ba2e322794aa044803f3edc2a
author Eric Laurent <elaurent@google.com> 1266866391 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266866391 -0800

am 8978547f: am f5fe3949: Fix issue 2459650.

Merge commit '8978547f254b6b6ba2e322794aa044803f3edc2a'

* commit '8978547f254b6b6ba2e322794aa044803f3edc2a':
  Fix issue 2459650.