diff options
| author | Ed Heyl <edheyl@google.com> | 2012-11-01 19:18:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-01 19:18:16 -0700 |
| commit | 7b16d9b18c7d06b298cd09ebb82e91f1c527ea8b (patch) | |
| tree | 64f386226c570ef51f2d8c6fb3667ccb23d56824 /tools/aidl/generate_java.cpp | |
| parent | dd1caa005019069b5e0c633b765379409cb1a236 (diff) | |
| parent | fc3d4dbd091ad91307bbba63892f2cee42f97f5f (diff) | |
am fc3d4dbd: am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev
* commit 'fc3d4dbd091ad91307bbba63892f2cee42f97f5f':
Keyguard sliding challenge - fix overeager touch interception
Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
Showing message when max attempts are hit in face unlock fixes b/7306168
Keyguard tablet/portrait fix for HUGE security views
Cancel camera launch on screen off.
Fix launcher flash during secure camera transition.
Updating isShowing during onResume()
Suppressing FUL after going to backup fixes b/7449820
Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
Adding a button for expanding the clock screen challenge.
Accessibility support for the lockscreen - phone.
Stripping dead API related to keyguard widgets
FUL being unsuppressed when screen turns off fixes b/7453702
Show the keyboard less aggressively.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions