tree 34b3056aa39e2b0d2b3b50cfbc89c6e92575a180
parent 78f80beb6bc975fa012a0b190c8bd0130bd44db0
parent ac571749a577c3575793f870e95012ce6637f977
author Jean-Michel Trivi <jmtrivi@google.com> 1296080115 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296080115 -0800

am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master

* commit 'b8efdf7f80d9aa2cbeff881f22d283cf5045c379':
  do not merge bug 3370834 Cherrypick from master