tree 26a55a91c32ebef187c74260fef49925a6ef18ee
parent 1feff62f3660396442b88bb23865d2f37e50d8ab
parent 88ffed14ce314a8e1feb17b701dce8074516f92c
author Vladimir Chtchetkine <vchtchetkine@google.com> 1326241838 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326241838 -0800

am 88ffed14: (-s ours) am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.

* commit '88ffed14ce314a8e1feb17b701dce8074516f92c':
  Cherry-picked from c4f37eed7 in master. Do not merge.