tree 806f2e60bec603560154603574ac615997646f51
parent 1eae83c9d8552922cd059c74380ae6697964f69a
parent 830b417c08b2c76febed78c89d7e7d84ee8a43fb
author Yorke Lee <yorkelee@google.com> 1378860902 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378860902 -0700

am 830b417c: Merge "Don\'t clear call shortcut when entering call log" into klp-dev

* commit '830b417c08b2c76febed78c89d7e7d84ee8a43fb':
  Don't clear call shortcut when entering call log