summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/searchfragment/directories/res
AgeCommit message (Collapse)Author
2018-03-15Resolve all build resource conflicts.calderwoodra
For simplicity, instead of resolve the nui shortcut string, I deleted it since it isn't used anymore. Test: build log PiperOrigin-RevId: 189260472 Change-Id: I67d5a49d78916a8960e41ad1c7b7f59efad6d718
2018-02-27Move DirectoryCompat from "contacts/common" to "dialer/common/cp2".linyuh
Bug: 73887387 Test: Existing tests PiperOrigin-RevId: 187225355 Change-Id: I65de553078e147a46d933daf34dfd912fc8aa74c
2018-02-22Merge searchfragment/remote into searchfragment/directories and renaming ↵linyuh
things accordingly. Test: Existing tests PiperOrigin-RevId: 186355284 Change-Id: I7c2a2917175ef13742ca3b2e628d8655dc668f60