am dc113640: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit 'dc11364026c7b2cf70c1d5993cc703b132c44cfe':
  Convert resized() method to new parameters.
  Don't depend on LockPatternUtils to get DevicePolicyManager
  Fix issue #7097984 java.lang.SecurityException: Permission Denial:
  Work around instability of Display.getRotation().
  GestureDetector - Mask action when checking POINTER_UP
  Turn off deadzone flash, replacing it with logcat.
  Fixed MemoryUsage issue with reporting results.
  Use focal point for scrolling in GestureDetector
  Fix keyguard layout on tablet
  Check proximity detector before powering off.
  Fix PendingIntent caching for multiuser
  Fix adb install

...

This commit is contained in:

The Android Open Source Project

2012-09-10 17:07:21 -07:00

committed by Android Git Automerger

parent e5f4b20a65 dc11364026

commit 6248d3a3f5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available