am 60c2772c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge (54d499f6) · Commits · e / os / android_frameworks_base

Commit 54d499f6 authored Jul 01, 2013 by The Android Open Source Project Committed by Android Git Automerger Jul 01, 2013

Browse files

am 60c2772c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '60c2772c':
  Fix out of range glCopyTexImage2D Bug #9425270
  When a new user AID is generated, dump it to dropbox
  Recreate TextureView's display list on attach Bug #9425270
  Fix power issues around wifi scans.

parents 7601e31d 60c2772c

Hide whitespace changes

Inline Side-by-side

Please register or to comment