| commit | ab581457ae46e43bbfcc4927cd48b2fc1262c983 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Thu Oct 10 08:23:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 08:23:44 2013 -0700 |
| tree | 12a3e9141ce5abddead7b5b7fb9db01153db6175 | |
| parent | 6b1fbd50e790893689f244a986a547d38bdc7a11 [diff] | |
| parent | 1a5e6a7446fdaa8f8913b151ed6d1f70f74c939b [diff] |
am 1a5e6a74: am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette" * commit '1a5e6a7446fdaa8f8913b151ed6d1f70f74c939b':