| commit | 8e7c979bad7ac1349808f48e45f4878d8760de4c | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Wed Jan 13 21:19:59 2016 -0800 |
| committer | Bart Sears <bsears@google.com> | Wed Jan 13 21:39:37 2016 -0800 |
| tree | 94ac7144a6ad31aac49658dd0de47e9769fd78a6 | |
| parent | a9c8cf7bf514e30badbd5b235bd6113beeeba6ad [diff] | |
| parent | 7e0586b7a60564ee8d22ab8babf4605e758252fe [diff] |
resolve merge conflicts of 7e0586b7a6 to master. Change-Id: I73b3e010249ac7380677cb2e635f4c847a8446c4