diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-01-22 10:24:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-22 10:24:49 +0000 |
| commit | 3677117d2bc8b703ccad4eff5914a61508922dd6 (patch) | |
| tree | e2c61775e35ebbc45f57e5ca7f1a446c3db5738b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4f3615036db441c4a099dc789ebcdf641ac5a987 (diff) | |
| parent | ad44f7448f0b9aa672cad21300f436e369c8105d (diff) | |
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
automerge: ad44f74
* commit 'ad44f7448f0b9aa672cad21300f436e369c8105d':
Never set "Work" or "Personal apps" as prefered activities.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions