diff options
author | Xin Li <delphij@google.com> | 2019-02-24 02:30:33 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-24 02:30:33 -0800 |
commit | 0f6a0aa324ba9f6197f4f9b4a26c3db4fcd2935f (patch) | |
tree | 7ecff3507b406875ee7f6eeb6c7adf75806e71d2 | |
parent | f764cd366bea01f108a64a0bdb61458abfb041be (diff) | |
parent | c4d843b30ec240aa7c6c123ed5375640bc221a5f (diff) | |
download | nvram-0f6a0aa324ba9f6197f4f9b4a26c3db4fcd2935f.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: c4d843b30e -s ours
am skip reason: subject contains skip directive
Change-Id: I5d86cb78b2a7c5e5c48e56903a10c1ab5e7c0423
0 files changed, 0 insertions, 0 deletions