commit | 225fe49857cced2aad65d07be0c7cb4a328d7107 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:38 2020 +0000 |
tree | c64bbcfc6a1216e120bf8e65d46f783d22996aaa | |
parent | 54675c9796acc6991c19ca99f7617105ef167c14 [diff] | |
parent | 2d2b0e312d85dae087ff096d3779fe78cccd6dfa [diff] |
[automerger skipped] Merge Android R am: 7b0f618802 -s ours am: ca868bad43 -s ours am: 2d2b0e312d -s ours am skip reason: Change-Id I8de2fc066c5bde667983942a4239946136781c11 with SHA-1 e695f3af21 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/1422475 Change-Id: Ie8a9510699276bc061b817c22d29e0ff27e8edc5