tree c6b0c887e3e9962609755f40a3c82ee2aab344bc
parent f04364f0ff789935d05490ee684f01c3de431780
author Shih-wei Liao <sliao@google.com> 1329651125 -0800
committer Shih-wei Liao <sliao@google.com> 1329651740 -0800

Fix the build, because we still need the ret_shorty.

Also, changed LOG(ERROR) to LOG(FATAL) and added "TODO", to address
bdc's comments on the last commit. Forgot to --amend earlier, so it's a
separate commit here.

Change-Id: I3edf1e652e5c6b4da1251cab9219b8b2b3572203