diff options
| author | Craig Mautner <cmautner@google.com> | 2013-09-30 14:13:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-30 14:13:38 -0700 |
| commit | aeccbf7720b0fdaffc7b0ed9fe2b06ad50a22807 (patch) | |
| tree | b31b0a188db5d48a99b54869aa4820ab205c56d0 /core/java/android/widget/TextView.java | |
| parent | 66d1cd9da1f5bd3aa3c70a28cbd6bd8801049ace (diff) | |
| parent | 231bd6c514f15cb0b42a04d4fc7fc9631c743686 (diff) | |
am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
* commit '231bd6c514f15cb0b42a04d4fc7fc9631c743686':
Dismiss keyguard when resuming visible activities
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions