am 16f1d2ca: am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2

* commit '16f1d2ca00a2c793e510edba5266a6d0998efbfc':
  Support chorded fallback keys. (DO NOT MERGE)