| commit | 6a0db5990187a71427029fb0fd64394e849aa057 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Dec 13 15:59:51 2013 -0800 |
| committer | Kenny Root <kroot@google.com> | Fri Dec 13 15:59:51 2013 -0800 |
| tree | 8dfd57e52d505162c96357350f95ec97932271de | |
| parent | d08eadd287991ec18eafe620b24e2b1bf0ce1f2d [diff] | |
| parent | e0b14ea70b58cd04696fb37ffcf733eefc2dd717 [diff] |
resolved conflicts for merge of e0b14ea7 to master Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51