am 35c2a740: (-s ours) am 9b2d4bde: am 39ccc44b: am 6594318e: (-s ours) am 5ce96037: (-s ours) am d03f1793: am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2

* commit '35c2a7408bc6857c9b1ac5fd25c047a388442d0d':
This commit is contained in:
Satoshi Kataoka 2013-10-09 23:54:24 -07:00 committed by Android Git Automerger
commit d733aadb8e

Diff content is not available