tree 1e0b03164753ed7a9a5fb5e98a5cd900288a6580
parent 91e7b0562dfb9def27be42761057614d41234206
parent bfa2f13fd3f463dbceea4d3a18c3124e70df0a05
author Jean-Michel Trivi <jmtrivi@google.com> 1296323681 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296323681 -0800

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

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