tree e7e675817691e73e4260774f3f8b3f884560c659
parent 5aa44e2d7a15a743113aab386e465492d101e2bd
parent 4c90a648cd0e1310d4b934c54905af3cf40b2770
author Jean-Baptiste Queru <jbq@google.com> 1308254253 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308254253 -0700

am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '4c90a648cd0e1310d4b934c54905af3cf40b2770':
  Switch back to mksh as the default