tree 9f5c72b8204a1881baabecb19901c886ba9dbab6
parent 6f82a0f220d7874c536c3b532f296ae1123f06a0
parent 0714d122ac72bdf0c0df208f6fbf6e7573bf2755
author Chalard Jean <jchalard@google.com> 1596783570 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596783570 +0000

Merge changes I33b70b0a,I1074eedb am: 0714d122ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725

Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450