| commit | 9c5572957bf357897f0969d002132fc647bfa649 | [log] [tgz] |
|---|---|---|
| author | Alex Light <allight@google.com> | Thu Dec 17 15:48:01 2015 -0800 |
| committer | Alex Light <allight@google.com> | Thu Dec 17 15:48:01 2015 -0800 |
| tree | 84e853d076d2a7449e0eba1710b2a4b3d0872fda | |
| parent | 90f5250d4ba7bcf6066edb022f8325df66d686f3 [diff] | |
| parent | 9f784b26a13101222c5e5927cafd7f500d3cff67 [diff] |
resolve merge conflicts of 9f784b26a1 to master. Change-Id: I9ebcb6e3d51be922e08e5f867fb8dcaf5cb9788d