| commit | 48f1fed84889c910411c0c987237c633bdaffbe9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Sep 11 03:58:41 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 03:58:41 2020 +0000 |
| tree | dc14d3d116fe072cbfd245e73567c9d2eaf42384 | |
| parent | 40bd1579bd475088137eda88e8fccf67985b7a42 [diff] | |
| parent | c1c1d6bf6c9150479775025e652ebdd5acf26440 [diff] |
[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ifff2652f8c190fcc64d55adadf35cb2c19a7bc8a