tree 68b301345fa23c6c4584a8c302144474ebb6704d
parent b894dff61757bfc014a5102781a35b1371330e88
parent b48d5773d81cfd839cdc1afaa0b176cffe6539cb
author Elliott Hughes <enh@google.com> 1472266034 +0000
committer android-build-merger <android-build-merger@google.com> 1472266034 +0000

Merge "Restore some of the mksh builtins." am: cd79a34d28
am: b48d5773d8

Change-Id: I8c6a2f2b317fda8699b33990eb33af61d8e48211