tree 51cd24518b1e35875755d3f2a1b01d969afbd2d2
parent 6a514ef5ee27c98c7a7387b3df7b2a4974802252
parent 7b61672ada13bc150444dfbfe82178d5a0345474
author Yorke Lee <yorkelee@google.com> 1398862461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862461 +0000

am 7b61672a: am 3b76216f: (-s ours) am adee51c0: (-s ours) am 1cd781d5: am a1d699ba: Merge "Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE" into klp-dev

* commit '7b61672ada13bc150444dfbfe82178d5a0345474':