| commit | afa6e1abbedaad8fe854b0f43999b8aeb801af91 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Sat Jun 28 11:35:29 2014 -0700 |
| committer | Matthew Xie <mattx@google.com> | Sat Jun 28 11:35:29 2014 -0700 |
| tree | d296163b2dc4e8f0f6b6420807f2e13c7d9fefcf | |
| parent | 4dcde90649cc51ca815a50d338a73adb408ab258 [diff] | |
| parent | e8c3d75b75493911ebf0f99c83676359657178f7 [diff] |
resolved conflicts for merge of e8c3d75b to master Change-Id: I78ef69c4d54a36243620ae14296d3507e3339567