| commit | 6bd4588d65977956cadf2e5d384673c64329c8e8 | [log] [tgz] |
|---|---|---|
| author | Riley Andrews <riandrews@google.com> | Mon Jun 23 15:20:51 2014 -0700 |
| committer | Riley Andrews <riandrews@google.com> | Mon Jun 23 15:20:51 2014 -0700 |
| tree | f9f56e60e15c9b1a244e28e920acd064f70f44f2 | |
| parent | 62ecd51f8a5435e925382ee1f0064655b75cc936 [diff] | |
| parent | 079c637f3d269242bbc772b9207179b8cf56738a [diff] |
resolved conflicts for merge of 079c637f to master Change-Id: Iab9a857026de954d7497d6b0eaf3751d2d3904c7