| commit | fb3083ef6f7714d3e03db37ae086abbd8f339d52 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Thu Jul 12 09:36:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 12 09:36:35 2012 -0700 |
| tree | 10f8d8639170ffa87d84a12e36cd35a59e1c9b3d | |
| parent | a44a92914b827a4a144d32537950398657b6dd9d [diff] | |
| parent | 96d9fa29cd1ff48b733eb090e99fe165d194d313 [diff] |
am 96d9fa29: resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp * commit '96d9fa29cd1ff48b733eb090e99fe165d194d313': use default shell (mksh) in emulator