commit 34a1401e2e9eefa9371a9540867fc2db6c9ef474
author The Android Open Source Project <initial-contribution@android.com> Tue Mar 12 14:16:35 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 12 14:16:35 2013 +0000
tree 9297eff8a0392825a418729f827a82153212d9e9
parent 92291eea076f0222d4f189cd62a0576434058ead
parent b563b46f8e0eabd6ca2262452d3e0cefb71971e1

am b563b46f: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'b563b46f8e0eabd6ca2262452d3e0cefb71971e1':
  am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."
  Add debug for b/8263462.
  Don't apply scale to glyphs when a perspective is set. Bug #8337925
  Round scale factors to rasterize text
  Fix issue #8325007: EyeEm app crashes on launch- NPE at...
  Add window leak check and possible recovery.
  Defend against NaNs in panel animation code.
  Fix issue #8311263: Corrupted UI across all tabs in People app