tree a8886da36bc5f28705379761e7912f62d2ae5b58
parent fd909a774cb384b139c5e360cadb2681c3f48c29
parent 9163a4a686fc25fefc77d5b41c24a4538486a48e
author Xavier Ducrohet <xav@android.com> 1310594034 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310594034 -0700

am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.

* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
  Merge 36a3a392 from mr1.