tree c6e7e2f3f49baef1dcfa5dda1d0b017dc235dd5f
parent a9b84a7e0b3ecb389a62bc6abb8c2fea3a4a30a6
parent 74159657687aadab4c82e4fd7e7a54d16c045d95
author Vladimir Chtchetkine <vchtchetkine@google.com> 1326241185 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326241185 -0800

am 74159657: Cherry-picked from c13daef7b on master. Do not merge.

* commit '74159657687aadab4c82e4fd7e7a54d16c045d95':
  Cherry-picked from c13daef7b on master. Do not merge.