| commit | 42b8adb7345cf1ac71f219761328c07c4199be02 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Sep 02 02:22:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 02:22:28 2020 +0000 |
| tree | 6a42353808547de0134f8689b53c721ce5848248 | |
| parent | 14c8d047b086e034afaab10ee3d979778e024437 [diff] | |
| parent | 8262aad90b409c840e2f8207f38d34e0078728fc [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: de477966df -s ours am: 00274210ae -s ours am: 4a0532aa47 -s ours am: 6ba54fcc1e -s ours am: 8262aad90b -s ours am skip reason: Change-Id Ia4252557017a3f7dc4e40a4e006994becdcfc77f with SHA-1 1508d88344 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/12484866 Change-Id: Ie734cf35707c3dede6335bc0955a56c9974ac177