diff options
| author | Winson Chung <winsonc@google.com> | 2017-05-22 16:20:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-22 16:20:18 +0000 |
| commit | 75eab7fa160b56a0ae950711f3461520470f6674 (patch) | |
| tree | 1768f207d9bdd76ea7189ff503f11696acd7a3a0 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b8bcdf50e4b52f00c1c74afca776d483fe3fb6da (diff) | |
| parent | 305c332c2219878f009aefad4471d87f08359981 (diff) | |
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
am: 305c332c22
Change-Id: I9fc712b5b5d96398177883b1979a3ea5744efa89
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions