| commit | d733aadb8eb466577606d55a92d68bbc1c89d14f | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Wed Oct 09 23:54:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 23:54:24 2013 -0700 |
| tree | 4f215378dbc96e139e12902a3c5387a1ee112011 | |
| parent | 8435025f593606b46ee91325f78d07baceb61458 [diff] | |
| parent | 35c2a7408bc6857c9b1ac5fd25c047a388442d0d [diff] |
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':