diff options
| author | Nick Kralevich <nnk@google.com> | 2012-11-30 10:35:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 10:35:44 -0800 |
| commit | 849f5188e34ea667b689e795d88411a2412db2e8 (patch) | |
| tree | 5f15d17738ad91ae0bf670594d10dc8092615521 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0a6620e8615ade341336730a5aa9f0e62a295c9f (diff) | |
| parent | 6643ea823bf8b0726da0518ffecfcc7a9f60f87d (diff) | |
am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
Secure a handful of framework broadcasts
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions