tree a81e6b7edd165b48fb58a3edeed6c0cf0f35a6b7
parent 876a846edc6a9d9c6957ee0f63b01951763e3606
author Adam Cohen <adamcohen@google.com> 1371234179 -0700
committer Adam Cohen <adamcohen@google.com> 1371244759 -0700

Fixing up handling of shortcuts

Change-Id: I70dd044b608f4ef18a9c436964a11122168305d0