| commit | 49c21b82b4e487112d21b07d84d08414ef28040f | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Tue May 13 15:19:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:19:11 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | b3c838208e1349d9ba896ac45533cab8c16e69c9 [diff] | |
| parent | 620f19af47d7783151ce554d8cfe4d56fd543d07 [diff] |
am 620f19af: am d43bf2c3: am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" * commit '620f19af47d7783151ce554d8cfe4d56fd543d07':