| commit | 9d5635501a9fdf2f9ef5b51a4be021622f2f9a67 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Tue Mar 11 19:52:17 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 11 19:52:17 2014 +0000 |
| tree | ca32d7f7f07b02b48f29b27556c8195711680f6a | |
| parent | c046b48bd6a048b5b3c020b49c778536165668e3 [diff] | |
| parent | 4ececa33b8d05aa28229b8c9fddec28a4ccac3b6 [diff] |
Merge "Align "from code" parent-child preference flow with "from XML""