| commit | 4b21979219cb2a3a440792b30aff75f3f9dfcc5c | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Tue Nov 26 13:45:38 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 26 13:45:38 2019 -0800 |
| tree | e52a2a922453f948f8acaeb3ff7bf20a34a7aafa | |
| parent | 7761845259920729baedcb58e23eb7fbcf478b8a [diff] | |
| parent | 0331ee35b1f6b45b8e2e6a1e0cfdc15fab710f6c [diff] |
[automerger skipped] Merge "Remove @SystemApi annotation for an overriding method" am: 5c7bd75060 am: 232c2e84da am: 0331ee35b1 -s ours am skip reason: change_id I60890104bf20a2c674edd91ec6b487cca1b4e37b with SHA1 1620457e34 is in history Change-Id: Ic116990b7386e530d407e97246264eb34b51f9a7