| commit | 1022888d33c82dedb3ab3a53d1c3bb432eca93f7 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Dec 04 16:06:34 2014 -0800 |
| committer | John Reck <jreck@google.com> | Thu Dec 04 16:06:34 2014 -0800 |
| tree | 468f5a69618392e22d87ec1dbf6c87700da4cf05 | |
| parent | 18be00f77ab6d534d378f09bd254ad397ac10a7a [diff] | |
| parent | 203c8171806a15b83efa9ad56be048281a40693b [diff] |
resolved conflicts for merge of 203c8171 to master Change-Id: I256397410c261fae049bae4572f132235be1c5c9