tree 28d2a56279f596317e98361b18276cc273322304
parent 29040f6ddb44960cdf3fe830c5838bd5bca893da
parent 9791e6ea170a6c6a2fc042a24d50af06c7238d83
author Raphael Moll <raphael@google.com> 1300987373 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300987373 -0700

am 9791e6ea: am 7e58a5fa: Merge "Merge 960ad4e0952da55943591098ea74827de921d303 from master_open." into honeycomb

* commit '9791e6ea170a6c6a2fc042a24d50af06c7238d83':
  Merge 960ad4e0952da55943591098ea74827de921d303 from master_open.