| commit | 4add6968be91e6ed2ebbf1d1fc241158255d324c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jul 17 13:28:30 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jul 17 13:28:30 2013 -0700 |
| tree | b552becb8ab2a0fc65f7176a22a1bcb44d95036e | |
| parent | a5a3b3bdb13f21af49a2ce8c3b1d08e9ac448eb2 [diff] | |
| parent | e35d6c28dfa524ff5035a738ead99c511812e0b9 [diff] |
resolved conflicts for merge of e35d6c28 to master Change-Id: I237bfc35d872a2e2ff10984012f9811488a5cea7