diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-08-18 11:58:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-18 11:58:55 +0000 |
| commit | c5b37d1bcf48ef93a1970560f2bac422cb3050b4 (patch) | |
| tree | c80b8427bbfb2d02a3e17f1e7aba21afc61dbc52 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0cb91c0f8601d0ce62ece10ca56847b687ad164a (diff) | |
| parent | fde112a2eb64c02d46fc0c42a4874f9e0631d611 (diff) | |
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev
am: fde112a2eb -s ours
Change-Id: Ifd70f2e30efc2d16b32fb140622698a36d506adf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions