| commit | 76e3ee4c4f6afb13261ed3f1e8a0d6b252765dbe | [log] [tgz] |
|---|---|---|
| author | Naveen Kumar <kumarn@codeaurora.org> | Tue Dec 06 18:31:10 2016 +0530 |
| committer | Naveen Kumar <kumarn@codeaurora.org> | Tue Dec 06 22:39:08 2016 +0530 |
| tree | f902ea98dd4f29d24f5fec8ae8c1c67c59c602e1 | |
| parent | 2b7b529d48b8ae2629a4644063332adb3ebc2256 [diff] | |
| parent | 03ebc3fed807757491a9dbe9de615307b41ebd75 [diff] |
Merge commit '03ebc3fed807757491a9dbe9de615307b41ebd75' into remote Conflicts: src/com/android/dialer/SpeedDialListActivity.java src/com/android/dialer/dialpad/DialpadFragment.java Change-Id: Ied8029752b8452f4848a9ef5347a12a89db3a7ee