| commit | 191e5988d077007e42e1706810c0999abd35ca8d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sat Jun 28 13:49:26 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Sat Jun 28 13:54:24 2014 -0700 |
| tree | 29bd71e2764b576cf48d11c5f55965ac63783757 | |
| parent | 8d43e17bfdf7fb9bd22d02665005f226d9d35a81 [diff] | |
| parent | da92aef762fbdf60245746932354998515b68d57 [diff] |
resolved conflicts for merge of da92aef7 to master Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861