diff options
| author | Chris Elliott <chriselliott@google.com> | 2016-11-10 18:44:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-10 18:44:06 +0000 |
| commit | c07d8aa52d7e31b0e8e7adacb6d910b57a6ec92f (patch) | |
| tree | cf8060e5cb3bf234eb20ddf4ad79c6fca7d20487 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5c10f1e552c35b756ddc4a9942ddc6da7dd96016 (diff) | |
| parent | 8409d50122acb5dbf319800fdde1bc5ed360ea4c (diff) | |
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours am: 69246f0565 -s ours am: a8a116b001 -s ours
am: 8409d50122 -s ours
Change-Id: I31d22a167ee7de857ed0403b2d14daa1d90055f0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions