diff options
author | Xin Li <delphij@google.com> | 2019-02-24 02:19:11 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-24 02:19:11 -0800 |
commit | 7fa58fa14436676f36c62bead0471c2e367d0af0 (patch) | |
tree | dea7a30f3bdd636d3617eb6d98d4acb9df7c1d01 | |
parent | 08755348c7d71bae616a38242098b70817379e89 (diff) | |
parent | cad46da17d14b5c140b517d4c0efd59b7d81ea93 (diff) | |
download | libkmsxx-android10-qpr1-release.tar.gz |
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: cad46da17d -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb3ebd4d2c1ff57eae9921a4b47bc409e9f739e5
0 files changed, 0 insertions, 0 deletions