tree 68b301345fa23c6c4584a8c302144474ebb6704d
parent 93d7921fa0a5ab4d60358e0c78ff0d0b1e59932a
parent 10787a6eeec918e3ac5cdf799f43ece100f37488
author Elliott Hughes <enh@google.com> 1472266244 +0000
committer android-build-merger <android-build-merger@google.com> 1472266244 +0000

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

Change-Id: I49b1c553ffc8749c9c3e15e73cf036b08a3d18dd