| commit | 240bfedbcc73bec57d02fa0271e9eaef2f32e786 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Thu Mar 06 21:01:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 21:01:48 2014 +0000 |
| tree | 14ce7f8e18f06b9801d66719338b18c31ff3523a | |
| parent | c49aaa128f71eb5ec85d2fe3b6fd561420cdc633 [diff] | |
| parent | 55e52f7fa0c72256178950606819bfe5d39b7e43 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/external/chromium_org/third_party/ots