| commit | 20a4ecf4b5d5b347fabd73fa047b591b2721c826 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Mon Dec 12 11:14:01 2016 -0800 |
| committer | Aurimas Liutikas <aurimas@google.com> | Mon Dec 12 11:14:01 2016 -0800 |
| tree | d608c3c9f767b5eabc2e59466456c1db61b8a71f | |
| parent | 65c889a86151784d2e46664043582a6ea32957b7 [diff] | |
| parent | 232bf85eb3c5066e97a2a1d3fbb251e9f69501ca [diff] |
resolve merge conflicts of 232bf85 to master Change-Id: I5848b81288e9c26f24429cf61e564cb84a366867