tree 41ddc4fa15e2220ebe363604c34f62911cb578a5
parent ea37c3c842f44d38e54d4b24244097f8377d16db
parent c01b6234bd91be2ef389f42a5219f7a03c278d72
author Tony Mantler <nicoya@google.com> 1474322011 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474322011 +0000

Merge "Allow styled text in pref titles and summaries"