| commit | ce4ecc9442b653a5f07150bc99fd388c8cb36899 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@android.com> | Thu Sep 13 14:12:03 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 13 14:12:03 2012 -0700 |
| tree | 0c74e8ec3f64e62de233f0be3f16438fa8cafb56 | |
| parent | 5014b888b52b6605aeed62e6447974974d61ae53 [diff] | |
| parent | 700142f66bf8f8f14ed25a6a9f67f6c1f44a3dbc [diff] |
am 700142f6: am b7ee3b51: Merge "BrowserSettings required a Controller sometimes" * commit '700142f66bf8f8f14ed25a6a9f67f6c1f44a3dbc': BrowserSettings required a Controller sometimes