| commit | cfc630eb9406f1a3319a0742cc5e247168097891 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue Mar 25 09:27:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 09:27:44 2014 +0000 |
| tree | 7c67abb754a48610ecfa88fb3dadaa3626211644 | |
| parent | 7794e6f1b1477aadbabcb90dff48f27367f010ab [diff] | |
| parent | fa829f0d604a123a7cd4dd5df38832e59a43e1b7 [diff] |
am ca837aa0: resolved conflicts for merge of 9e1f62f0 to klp-modular-dev * commit 'ca837aa02e64b3c67d35c6d7b9f499d502ea34c8': DO NOT MERGE Fix for in-call dialpad not sliding full length of screen