| commit | e3fd5a1ca499d3dcc92332bcded3100c3d249917 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Mar 13 01:55:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 01:55:45 2014 +0000 |
| tree | a3ffead296dfd2cad58284b5e27ca171a937dee1 | |
| parent | fad9a0a3928d1c7932baac0448077fa3f72cca18 [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"