| commit | 376cc9eb12164993526d5582cff91928ffcbb4fb | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Tue Dec 10 01:46:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:46:40 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | 3627ed12fc32e3cd12ea4e1f4047b088cea321b5 [diff] | |
| parent | 8a759098f692f59d2b29ce5a0e429b6be04f3f3d [diff] |
am 8a759098: (-s ours) am 6d46f372: Merge "Cherry Pick [Android WebView] Add an API to control favicon loading." into klp-dev * commit '8a759098f692f59d2b29ce5a0e429b6be04f3f3d':