| commit | 849942950e50f5f53c5fd22a7a5641e9d496fdeb | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Thu Oct 10 08:33:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 08:33:14 2013 -0700 |
| tree | 12a3e9141ce5abddead7b5b7fb9db01153db6175 | |
| parent | 604f523ef20c4ef565386a203ccba15a699c5595 [diff] | |
| parent | 56e21a02f071306704ec1ab9ac099fd3c2811461 [diff] |
am 56e21a02: (-s ours) am 85dec741: am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev * commit '56e21a02f071306704ec1ab9ac099fd3c2811461': Tweak vertical gap of Emoji palette. DO NOT MERGE