diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-01 07:47:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-01 07:47:49 -0700 |
| commit | 54d499f6db7b7fa42543cae98b001f790c8df70b (patch) | |
| tree | e5d93028a36454d866e2f7ee1321de2a13de006c /libs/androidfw/VirtualKeyMap.cpp | |
| parent | 7601e31d140046aa759cdc5299447b298a5f0c85 (diff) | |
| parent | 60c2772ca7aa9d532a3b22e44b298e27204a40a5 (diff) | |
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.
Diffstat (limited to 'libs/androidfw/VirtualKeyMap.cpp')
0 files changed, 0 insertions, 0 deletions