tree 56204f636f50e17ea9ea6b1b5751edf28cf1ea97
parent f75fb86c94a0bdde4cb7df38356e037b244ebb78
parent 510c489a081dae49f86033ecbf1b6e866c69656c
author Dianne Hackborn <hackbod@google.com> 1257905735 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257905735 -0800

am 510c489a: am d4e57d4c: Related work on issue #2170897.

Merge commit '510c489a081dae49f86033ecbf1b6e866c69656c'

* commit '510c489a081dae49f86033ecbf1b6e866c69656c':
  Related work on issue #2170897.