tree f902ea98dd4f29d24f5fec8ae8c1c67c59c602e1
parent 2b7b529d48b8ae2629a4644063332adb3ebc2256
parent 03ebc3fed807757491a9dbe9de615307b41ebd75
author Naveen Kumar <kumarn@codeaurora.org> 1481029270 +0530
committer Naveen Kumar <kumarn@codeaurora.org> 1481044148 +0530

Merge commit '03ebc3fed807757491a9dbe9de615307b41ebd75' into remote

Conflicts:
	src/com/android/dialer/SpeedDialListActivity.java
	src/com/android/dialer/dialpad/DialpadFragment.java

Change-Id: Ied8029752b8452f4848a9ef5347a12a89db3a7ee