| commit | 6594318e7db5998c4be634ca0ec957d4115706d3 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Fri Oct 04 11:10:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 11:10:43 2013 -0700 |
| tree | 58230d6c9abb50fcf3ed960214d462097d09a92b | |
| parent | 423921ca131dd1f330599063d34acd714889edf1 [diff] | |
| parent | 5ce9603784423f6dfa4f0654b0b104591f7ac1ae [diff] |
am 5ce96037: (-s ours) am d03f1793: am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2 * commit '5ce9603784423f6dfa4f0654b0b104591f7ac1ae': Do not merge. Revert emoji key position to JB-mr2