tree b43c2acde37af8fdbef6954d495fdfc6fa58efff
parent 8642b9b0c757f9e1fcd091aad6ce1b97e16724e2
parent ae4298286896cbef22b2af285a3f651e8f498185
author Vladimir Chtchetkine <vchtchetkine@google.com> 1326241722 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326241722 -0800

am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.

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