| commit | e9a60f2aaf4398063e631c97521dc78dd637f4bd | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Oct 17 18:12:37 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 17 18:12:37 2019 -0700 |
| tree | 2e58ac1f61cc1926b785963f521c23480d24b2ee | |
| parent | 5bc6e253e89ae5892043b1e855bae92de4def8f8 [diff] | |
| parent | 38ea0696e9a0505c1213136d73e780cfd1224f20 [diff] |
[automerger skipped] Merge "Move JetPlayer to JNI" am: 77185b7f00 am: 23986da952 am: bab95e0b6f am: 38ea0696e9 -s ours am skip reason: change_id I14b8241c5eb6c789ebc5d6725db716b9b0f8f31f with SHA1 a33446ada9 is in history Change-Id: I35d55a6cc37bf8ebeae2f98976a976beee99533f