summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2015-01-22 10:32:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 10:32:30 +0000
commit2cb240e083ddf8e700d04cae6d243d2aab4d65e4 (patch)
treebdc34ef6f1dd029a0f56128114eba8bbf659381b /tools/aapt2/java/JavaClassGenerator.cpp
parent61b07b4016ebdbfe7215c0cc03fd65ddf55c6703 (diff)
parent3677117d2bc8b703ccad4eff5914a61508922dd6 (diff)
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6': Never set "Work" or "Personal apps" as prefered activities.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions