tree 898d58ffd461620263139ea13cf338721925f32d
parent 9dd2eef07bbee6ff5b1d1a9ccda6e3499391ecb6
parent 74159657687aadab4c82e4fd7e7a54d16c045d95
author Vladimir Chtchetkine <vchtchetkine@google.com> 1326241182 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326241182 -0800

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

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