| commit | 041b0f93ff8e799c166093e85b9f001082db4b96 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Dec 11 22:08:00 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Dec 11 22:08:01 2014 +0000 |
| tree | 1d31610b074de1c008b99ac58ce6d0e54a8369a4 | |
| parent | 8b58d9bd02e2c55f547fafbe9ba55b1160665761 [diff] | |
| parent | 1286c078a4b93695b3812e8c7fe7918c28ea18b4 [diff] |
Merge "Sync to upstream head."