diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-05-17 12:59:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-17 12:59:37 -0700 |
| commit | 56cf63f8ecc16da4e9a317fd89ea505d4737f8c8 (patch) | |
| tree | f9d7ff3db2dcee7fee28c01d93a7eebe22e253cb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2feefe01e92cc83cc5bcde1245347ea22bc6ccf3 (diff) | |
| parent | b46674978765e29d838eb7e5d4810d047037f855 (diff) | |
am b4667497: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'b46674978765e29d838eb7e5d4810d047037f855':
Add min delay between disable and enable of wifi
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions