| commit | 620f19af47d7783151ce554d8cfe4d56fd543d07 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Mar 12 13:00:36 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 13:00:36 2014 -0700 |
| tree | 0c244d94a898908e8ee31d618dcea7ca38c1e06d | |
| parent | c98496f27a71f082b66b8c62bae8610fb3415410 [diff] | |
| parent | d43bf2c3714332832cf4ec1c99c2a9fa24784ab2 [diff] |
am d43bf2c3: am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" * commit 'd43bf2c3714332832cf4ec1c99c2a9fa24784ab2': Align "from code" parent-child preference flow with "from XML"