tree b0f6ea9ea6e28ddd2cc25d21396a66ffe5336f3f
parent 1a082f3061c2a444ac6602f321aa334589167f07
parent bfa2f13fd3f463dbceea4d3a18c3124e70df0a05
author Jean-Michel Trivi <jmtrivi@google.com> 1296079518 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296079518 -0800

am 2ba92c71: do not merge bug 3370834 Cherrypick from master

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