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