| commit | 2b4b4814aebf1721742fd3fb335478a98b6a902f | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Mon Sep 14 23:10:42 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 23:10:42 2020 +0000 |
| tree | 7fe840d92f08ec02eb84d73bbd76225c34542870 | |
| parent | 976aab00c0fb913e3d1b15f895899f5c458459fe [diff] | |
| parent | e684d1e089fbf772829c8ba1d6ac8521beb4d880 [diff] |
Merge changes from topic "sep11" am: 9cf5f56268 am: e684d1e089 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195 Change-Id: I7da537200efe31e803234bd1a0236843064186c8