tree 49e45d52cc103f5e68532ebe13bc131f4557eb35
parent abba63eac95b210a709872f30f91216ee87ee27d
parent fc37a45afae5092f0d0ddb2ff515ec71da9e361e
author Wenyi Wang <wenyiw@google.com> 1456079428 +0000
committer android-build-merger <android-build-merger@google.com> 1456079428 +0000

Merge "Revert "Move AppCompatPreferenceActivity to ContactsCommon"" into ub-contactsdialer-b-dev
am: fc37a45afa

* commit 'fc37a45afae5092f0d0ddb2ff515ec71da9e361e':
  Revert "Move AppCompatPreferenceActivity to ContactsCommon"