refs/heads/idea133 - platform/packages/apps/InCallUI

commit: cd29be4cd60d6818b58a5927d452aaf52da43f6b
[log]
author: Chiao Cheng <chiaocheng@google.com>
Thu Nov 14 15:44:44 2013 -0800
committer: Android Git Automerger <android-git-automerger@android.com>
Thu Nov 14 15:44:44 2013 -0800
tree: 39dfdf98d640a7674a562c023af847621e1810d8
parent: 1d0e426ed2a22deffca8e24c463be7dc44bfe296 [diff]
parent: fa7dd7517d9330abb0750763b6466f2bfa536243 [diff]

am fa7dd751: am 59517317: Merge "Add logic to dynamic dismiss keyguard." into klp-dev

* commit 'fa7dd7517d9330abb0750763b6466f2bfa536243':
  Add logic to dynamic dismiss keyguard.

tree: 39dfdf98d640a7674a562c023af847621e1810d8

res/
src/
Android.mk
AndroidManifest.xml
proguard.flags