diff options
| author | Pierre-Laurent Coirier <plcoirier@google.com> | 2016-03-02 21:14:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-02 21:14:49 +0000 |
| commit | 3be2727d28fba3b3aef6ea800ed40aa5f8421451 (patch) | |
| tree | 9eb70ac4e33a3f49713bda5d1b59e4fd0a16e342 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f2bf0c4ba0a759b05a78ace4cb95c484a050aafe (diff) | |
| parent | 0048acfc16dc29aef69faeafa1200d0fd0206763 (diff) | |
Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev am: 54c3808802
am: 0048acfc16 -s ours
* commit '0048acfc16dc29aef69faeafa1200d0fd0206763':
Grant fixed SMS & Phone permission to package handling the twinning settings intent.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions