Commits
The Android Open Source Project authored and Android Git Automerger committed 77cda077c0aM
am 2c3c3040: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2c3c3040613b357b7755aacfe7717a44faf51885': Fix bug #7259242 text is left justified with no padding DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout Quick reject empty paths Fix bug #7259242 text is left justified with no padding MediaRouter/Wifi Display improvements Status bar: Keep disabled state per user. ScaleGestureDetector does the safety dance. Adding missing file in previous change (Bug 7252771) Add wireless display selection support to MediaRouter. Fixing crash in QuickContacts. (Bug 7252771) temporarily disable blacklisting Revert "Do not use last app rotation as default." Revert "Fix adjustViewBounds handling for ImageView" Global gesture to toggle Accessibility system-wide. Fix perf regression from scale/density mismatch Plug memory leak that happens when reusing display lists Bug #7195815 Don't use the QCOM_tiled_rendering extension with functors Bug #7247880
Showing diff to00ad60d381a