refs/heads/nougat-mr1.7-release - platform/packages/apps/ContactsCommon

commit: 80822d703db3f570dede42319db141f71d3c405b
[log]
author: Walter Jang <wjang@google.com>
Mon Nov 07 09:24:43 2016 -0800
committer: android-merger <android-merger@vpba3.mtv.corp.google.com>
Tue Jan 03 16:20:53 2017 -0800
tree: 84b40d40ec63ab96aada59819aee639a9232432c
parent: 1221f818b39e38f98fe4a5e3234ace8a20f6fde1 [diff]

resolve merge conflicts of 9f523b4 to nyc-dev

Bug: 32219099
Merged-In: Ib141ad682488aeabf6d90e8d169d5fff6df7a8dd
Change-Id: I895b1f9f8ade2dcfa47d1c17e0aaac2edeb75a74
(cherry picked from commit b7eecdd9a1276b721bb9644a0762dfd969e52709)

res/values/strings.xml[diff]
src/com/android/contacts/common/activity/RequestImportVCardPermissionsActivity.java[diff]
src/com/android/contacts/common/activity/RequestPermissionsActivity.java[diff]
src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java[diff]
src/com/android/contacts/common/util/AccountSelectionUtil.java[diff]
src/com/android/contacts/common/vcard/ImportVCardActivity.java[diff]
src/com/android/contacts/common/vcard/ImportVCardDialogFragment.java[Added - diff]

7 files changed

tree: 84b40d40ec63ab96aada59819aee639a9232432c

assets/
icons/
res/
src/
TestCommon/
tests/
AndroidManifest.xml
build.gradle