OSDN Git Service

am 96d9fa29: resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
authorGuang Zhu <guangzhu@google.com>
Thu, 12 Jul 2012 16:36:35 +0000 (09:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Jul 2012 16:36:35 +0000 (09:36 -0700)
commitfb3083ef6f7714d3e03db37ae086abbd8f339d52
tree10f8d8639170ffa87d84a12e36cd35a59e1c9b3d
parenta44a92914b827a4a144d32537950398657b6dd9d
parent96d9fa29cd1ff48b733eb090e99fe165d194d313
am 96d9fa29: resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp

* commit '96d9fa29cd1ff48b733eb090e99fe165d194d313':
  use default shell (mksh) in emulator