| commit | 890a210e41d6a77a87370e6782c2ee373fa857d1 | [log] [tgz] |
|---|---|---|
| author | Svet Ganov <svetoslavganov@google.com> | Wed Aug 24 00:08:00 2016 -0700 |
| committer | Svet Ganov <svetoslavganov@google.com> | Wed Aug 24 00:13:36 2016 -0700 |
| tree | ae061364e800d5348e91023b54dc490056b5ea1d | |
| parent | 575bb0fd33aadbead46796e70490a178ed4772b4 [diff] | |
| parent | eeeebd346a06cc1af2366b933355ac49717136fa [diff] |
resolve merge conflicts of eeeebd3 to master Change-Id: I3aa0d1b9228be408837f7dd93a9b8268e564fc65