| commit | 0b993e6141db5d534fb2a17599a08d3bdb30caaf | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue Mar 25 14:28:44 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 14:28:44 2014 -0700 |
| tree | 20ba5c1ee8d77011e64ed79df0a275448c5be3a4 | |
| parent | 2e8dbd338eb4b327a8adca8400ded3de909e7c31 [diff] | |
| parent | 1e75dfb8946bc6e6c11527a3495c1e5585e2bd77 [diff] |
am d869b5be: am 8eb9cd16: am 5d0ea3d8: am ca837aa0: resolved conflicts for merge of 9e1f62f0 to klp-modular-dev * commit 'd869b5bee916bdff1bc6fb63fbcbfb1ab9689340': DO NOT MERGE Fix for in-call dialpad not sliding full length of screen