diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-08 13:13:23 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 13:13:23 -0800 |
| commit | a2bf6181dfca0f93461fc041f2bd2444551a4515 (patch) | |
| tree | 6ff5aa54451c772965985395ec17b0a400270802 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b (diff) | |
| parent | 2c29deaa2650091d9206b8fa93f8a447ee247d52 (diff) | |
am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
Add mechanism to kick keyguard to show the assistant
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions