| commit | 12833fcb33c92bb69de45a7ce0c5b5d1e3d1c657 | [log] [tgz] |
|---|---|---|
| author | ihab@google.com <ihab@google.com> | Tue Mar 25 03:34:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 03:34:16 2014 +0000 |
| tree | 8a77ac40ca2080250a433bec68c6cdc4122f9cd3 | |
| parent | e0271c5a55fdd5c2847646d4a13ded71d100572f [diff] | |
| parent | be7a3d2e9ce867140be0bf2338e465fc3c9ce2c5 [diff] |
am 4149f823: (-s ours) am c756251e: am 00abc03c: resolved conflicts for merge of 0689fe99 to klp-modular-dev * commit '4149f82393f02319732c4d299866fa8a67aafb1b': DO NOT MERGE. Rearrange dialpad layout for better esthetics.