tree 60afaceda12b421087e6024c6609da505db188b3
parent 1fe3432661f96bf57b1e3bd91c3c01bd7564e6ae
parent 886130bc7ff992940e152636f57072e58c91aa2e
author Andy McFadden <fadden@android.com> 1289268812 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1289268812 -0800

am 886130bc: (-s ours) Two patches.

* commit '886130bc7ff992940e152636f57072e58c91aa2e':
  Two patches.