diff options
| author | Kang Li <kanlig@google.com> | 2017-04-12 13:27:14 -0700 |
|---|---|---|
| committer | Kang Li <kanlig@google.com> | 2017-04-12 20:36:07 +0000 |
| commit | 4762931cf73a774e4618fd3015c311b6cc0db16c (patch) | |
| tree | 552ac55601dc5f246ffbd929aa76f7387a5dc91b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 43791354c72dec37f9e93ab9cb1b494bb99926db (diff) | |
| parent | 40afdf05b5baf561adb495e881670e7dfd1120bc (diff) | |
resolve merge conflicts of 40afdf05b5ba to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic31b6858fb0850b36bb6751c6bd5ef18675ee277
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions