| commit | 4f6a77d529ae295630e22d4636c2acc2ba2fbb6d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sat Nov 09 09:23:19 2013 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Sat Nov 09 09:23:19 2013 -0800 |
| tree | 1eecf431db84a4c0cf7f1c20038c64ff3507fe1a | |
| parent | bcdbbfebc8f32566d4cb3f66405e89cdb7351992 [diff] | |
| parent | ad93c622492219e4ddf8d1458393727bab4d3f63 [diff] |
resolved conflicts for merge of ad93c622 to master Change-Id: I81dc207aa90a96cc46c8a929d745e9aefb0ad802