tree 51cd24518b1e35875755d3f2a1b01d969afbd2d2
parent 6e1ab6b28e64a3acce054b5dff4efb775940b4a6
parent 8bab32e86737c7f4d669f4682c5146fd2ef24b82
author Yorke Lee <yorkelee@google.com> 1398862464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862464 +0000

am 8bab32e8: am 92abcc32: (-s ours) am 45e95894: (-s ours) am 364b5735: am 82e17500: Merge "DO NOT MERGE Make dialpad slide down when dismissed by tapping outside" into klp-dev

* commit '8bab32e86737c7f4d669f4682c5146fd2ef24b82':