summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Makoto Onuki <omakoto@google.com> 2021-03-09 01:42:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-09 01:42:36 +0000
commit8f8ffd02f28974a1dc5df2b1c1f22408f43be9dd (patch)
treefc9b3d8396d88455564195c230c8a0168ba6ec8e /libs/androidfw/AssetsProvider.cpp
parent06085e6ab386065ba1fd6efc36827cef0bddd12f (diff)
parent4d832266632e22a8c5c006cd9616201011ff9729 (diff)
Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state" am: 4d83226663
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601731 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20ebeab1147f78b7ed2d481f00fd3d8cbb9a7879
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions