diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-01 07:42:58 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-07-01 07:42:58 -0700 |
| commit | 60c2772ca7aa9d532a3b22e44b298e27204a40a5 (patch) | |
| tree | 4069c309b45c4ad3dbae998f6b7ba9600e88f319 /libs/androidfw/VirtualKeyMap.cpp | |
| parent | 653efe738e5390112393d5ad2567595b5c9dd51e (diff) | |
| parent | d971caa5d529355d44b4d469eda8ef31daeb3bab (diff) | |
| parent | 84791f01f5c1b715aa1beebe1e65d7a765d63b2f (diff) | |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I03f18d4939d298225e8954dfff6dc9cdbe71b8c7