diff options
| author | Dan Sandler <dsandler@android.com> | 2018-05-02 12:52:30 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2018-05-02 17:52:00 +0000 |
| commit | eb18cffdc5b91f1509bb54194b20ba9eb0e47757 (patch) | |
| tree | 803e9f25c37b71ef0a2c2cdf7d5d5d260a97c949 /tools/aidl/generate_java.cpp | |
| parent | 8fabc163ff1c671eea56f25fe8605ff8f95440b9 (diff) | |
| parent | e323532e81971d044f576078b99e578597c6ee73 (diff) | |
resolve merge conflicts of e323532e81971d044f576078b99e578597c6ee73 to master
Bug: none
Test: just a compile fix
Change-Id: Iec4989e84126f1c5695a8b284f222946c74886e1
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions