diff options
| author | Patrick Huang <pinchin@google.com> | 2019-03-21 17:20:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-21 17:20:17 -0700 |
| commit | f417907d8723ffa0708b969fa2bbafdea9d7bed2 (patch) | |
| tree | 0e3f21e924078f37d96a0ffe09a4e063030ed9bf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b2c3f39189513312faee88767ff5a2d1057ceb77 (diff) | |
| parent | 956b77b87ad0e396738df281b5dbaae5748afed2 (diff) | |
[automerger skipped] Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED" am: 9a1888ce62 am: e41be2c876
am: 956b77b87a -s ours
am skip reason: change_id I1367fa988dbc71eb30631ebf9903309eba3ef96d with SHA1 0d081f4c17 is in history
Change-Id: Ifd6dde320607cb720e8135fa4eaac1e5453b7118
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions