| commit | e5e337c6e9cddfc70bc2d234add395c5bda8647f | [log] [tgz] |
|---|---|---|
| author | Ameer Armaly <aarmaly@google.com> | Mon Jun 29 16:58:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 29 16:58:34 2020 +0000 |
| tree | 84bb4254d6028bec9bb9ecff9a58578c62a215fd | |
| parent | abc2a25979045a46ba8385d9d23bf61c3cc76372 [diff] | |
| parent | 689ae63d5c5e1f367279dedc48b24106ca187e02 [diff] |
Merge changes from topic "rollback" into rvc-dev am: 724bc71208 am: 689ae63d5c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004859 Change-Id: I35c66975b215b8a01c1ece676a5385f52ece1e3d