summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Luh <williamluh@google.com>2013-06-05 16:11:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-05 16:11:27 -0700
commitb1b88e861c0748dd317b1e0ec00cc1d295e0b795 (patch)
treef7f930b159af02fba18e2386f10be97232d1d389
parentc7b0bbf20780be8efe77ed1fefff2632e9e79484 (diff)
parent7d8ea25e479744e0b9e9d58a4daa3579631ca3d3 (diff)
downloadContacts-b1b88e861c0748dd317b1e0ec00cc1d295e0b795.tar.gz
am 7d8ea25e: am 9ca2bf95: am 928cb3f9: am aa396d3e: resolved conflicts for merge of 8df53636 to jb-mr1-dev
* commit '7d8ea25e479744e0b9e9d58a4daa3579631ca3d3': Set explicit destination for CALL_PRIVILEGED
0 files changed, 0 insertions, 0 deletions