| commit | d43bf2c3714332832cf4ec1c99c2a9fa24784ab2 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Mar 12 19:56:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 19:56:45 2014 +0000 |
| tree | d9eae8b1353e72f581496abdbfa1db77078746c7 | |
| parent | dfc9958fa66b661e03ddb4afa716e5428e4af564 [diff] | |
| parent | f62824c658006c620be775ca82b74fcc6f82b59c [diff] |
am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" * commit 'f62824c658006c620be775ca82b74fcc6f82b59c': Align "from code" parent-child preference flow with "from XML"