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

* commit '14c45e2ef99bf87848a379879dbf8f4090799307':
  Support chorded fallback keys. (DO NOT MERGE)