diff options
| author | Andrii Kulian <akulian@google.com> | 2017-07-21 23:16:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-21 23:16:24 +0000 |
| commit | 504ea09356bbc20a61945afb79aadca429974ad8 (patch) | |
| tree | c3aed579e8328d0d16bd3ef3027b743cf7147163 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1cdf8ff72ea72c320a62b219e3ca07db9a652e4c (diff) | |
| parent | d313469e28268c864ab5c0467ffb4ccf16fe36f9 (diff) | |
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
* changes:
DO NOT MERGE VirtualDisplay wrapper with input forwarding
DO NOT MERGE ActivityView be gone!
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions