| commit | 19d4f1806a953b87435a2bb6fd8e738424e94003 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Tue Jan 08 17:38:15 2013 -0800 |
| committer | Romain Guy <romainguy@google.com> | Tue Jan 08 17:38:15 2013 -0800 |
| tree | ab561da75ff49699432723e2904a89d5cda534e2 | |
| parent | 1a9853fef502ef4dac48476b8b588650ae5db4ce [diff] | |
| parent | c88c60bed1fdf5b84cc16905c8743453203c19a5 [diff] |
resolved conflicts for merge of c88c60be to master-chromium Change-Id: I3b4b42443312068e942aa779dfdc928afa7569fd