summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Grace Jia <xiaotonj@google.com> 2020-08-13 19:30:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-13 19:30:59 +0000
commit1c997e4eadd68c18f9f29573f176cd3664813c1d (patch)
tree5b83b2e64c3e5ef0eb36ac96a2d040f0de080aba /libs/androidfw/AttributeResolution.cpp
parenta9b79ba27a8d3d1b93076cb0e1a201bea4d73d78 (diff)
parentf98b0c5eb1db8364c105aee574c4904a310163f5 (diff)
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644 am: 300b3cce72 am: f98b0c5eb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908 Change-Id: I3fc6ba1492996d41530461452e83759a490adc6d
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions