| commit | df89cba545b60f450dfd30ece138ffbdcd49b2c3 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Jun 11 13:30:31 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Jun 11 13:47:37 2014 -0700 |
| tree | 3aab4482f2308c4a7a4d932a09e493374881a059 | |
| parent | 20d3b9a65e33a36baaeab075ec87d8ebf6b009da [diff] | |
| parent | cf1042b7497095b416e88f5f9e25cc482187102c [diff] |
resolved conflicts for merge of cf1042b7 to master Change-Id: Ia51efd5a1584f6592ae0430418b610dd2ee5cc6a