| commit | 17fb428b1d8cd342098409df2cc7cf599cc2beb6 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Tue Dec 10 01:46:50 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:46:50 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | 8fbe4862059b124bba0f5529e05826d9bfad6990 [diff] | |
| parent | 1ccef681aabf83ae71e8c003d59ac39639e2c9b2 [diff] |
am 1ccef681: (-s ours) am 9ab648a9: Merge from Chromium at DEPS revision 30.0.1599.100 * commit '1ccef681aabf83ae71e8c003d59ac39639e2c9b2':