tree b37e4be98e3b1aed18096a51876b5d663ed25c51
parent de795d12d19e75b640d481d80a33a1173c5fc06c
parent f35cb6bc91d1a2b193940136b1b97b8d497170ce
author Treehugger Robot <treehugger-gerrit@google.com> 1506966962 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1506966962 +0000

Merge "Avoid NullPointerException when updating preference intents"