tree 46c353dbc3b59d84fcbcc5e34143ef819d4a8486
parent 6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75
parent 750ac4f3a43dfbb66e45517ce2502858daeab1a9
author Steve Howard <showard@google.com> 1278094272 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278094272 -0700

am 750ac4f3: Manual merge of change 50994 from master (DO NOT MERGE)

Merge commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9' into gingerbread-plus-aosp

* commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9':
  Manual merge of change 50994 from master (DO NOT MERGE)