Commits
The Android Open Source Project authored and Android Git Automerger committed 54d499f6db7M
am 60c2772c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '60c2772ca7aa9d532a3b22e44b298e27204a40a5': 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.
Showing diff to7601e31d140