tree 26a55a91c32ebef187c74260fef49925a6ef18ee
parent ceabb17306f4de9850516dae96bb0d2d5853f028
parent 8642b9b0c757f9e1fcd091aad6ce1b97e16724e2
author Vladimir Chtchetkine <vchtchetkine@google.com> 1326241350 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326241350 -0800

am 8642b9b0: (-s ours) am 74159657: Cherry-picked from c13daef7b on master. Do not merge.

* commit '8642b9b0c757f9e1fcd091aad6ce1b97e16724e2':
  Cherry-picked from c13daef7b on master. Do not merge.