| commit | 2773ab94d7d0d51e70c6adbb6fb942a859d1993e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Nov 07 09:44:31 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 07 09:44:31 2013 -0800 |
| tree | 3a31df99b0a6131153505e6da52edfab85ce686f | |
| parent | 4c2255c320545992b447e1b2fa8dd1cd5db5474c [diff] | |
| parent | 36e681b02a7cd2554f038bcac65d7fdfc7889273 [diff] |
am 36e681b0: resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp * commit '36e681b02a7cd2554f038bcac65d7fdfc7889273': Remove the hacks needed to support ash and mksh concurrently.