tree af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
parent bfd2f1d418b511f0a243218c86f092cc993bc152
parent 65a9bbe4516a950e38b44fdc0f817a22111def19
author Yorke Lee <yorkelee@google.com> 1398862209 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862209 +0000

am 65a9bbe4: (-s ours) am 58e66942: (-s ours) am f7b727e1: am 21ed6cb1: DO NOT MERGE Fade out favorites screen when dialpad is displayed

* commit '65a9bbe4516a950e38b44fdc0f817a22111def19':