tree ca32d7f7f07b02b48f29b27556c8195711680f6a
parent c046b48bd6a048b5b3c020b49c778536165668e3
parent 4ececa33b8d05aa28229b8c9fddec28a4ccac3b6
author Trevor Johns <trevorjohns@google.com> 1394567537 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1394567537 +0000

Merge "Align "from code" parent-child preference flow with "from XML""