| commit | f62824c658006c620be775ca82b74fcc6f82b59c | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Tue Mar 11 23:22:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 11 23:22:56 2014 +0000 |
| tree | a67a4a487b2348c530f773cf9f0662259520c1ea | |
| parent | 23f9bb62da2c1b8257ea656c0b14c2e0fca9648b [diff] | |
| parent | 9d5635501a9fdf2f9ef5b51a4be021622f2f9a67 [diff] |
am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" * commit '9d5635501a9fdf2f9ef5b51a4be021622f2f9a67': Align "from code" parent-child preference flow with "from XML"