| commit | 3586067b947f7280f36150350fe15f4a470d7d07 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Jun 18 14:37:58 2014 -0700 |
| committer | Jeff Davidson <jpd@google.com> | Wed Jun 18 14:37:58 2014 -0700 |
| tree | 3bfe1a36c3c52b681e87dac12b3564d47b1ab1dc | |
| parent | 071ff50916a80764b96788e02149c65f8e0df725 [diff] | |
| parent | d1616d2c3729417427837a0026875d6d9595c8f6 [diff] |
resolved conflicts for merge of d1616d2c to master Change-Id: I397ed3fb3bbf69a00a36d68a13e885c8acf7c072