| commit | 551112f15a648b739f842b2466b5fdae3e80d6de | [log] [tgz] |
|---|---|---|
| author | Alex Light <allight@google.com> | Thu Dec 17 15:51:00 2015 -0800 |
| committer | Alex Light <allight@google.com> | Thu Dec 17 15:51:05 2015 -0800 |
| tree | a7dd4e33ddcd58aa8b2b21ad53b7fc665274f9c7 | |
| parent | c976de8fbfb0235d9d678e10a55e123131f9f03c [diff] | |
| parent | 34b8470a61de61c56ef1a3d319abd1e44fa4f68e [diff] |
resolve merge conflicts of 34b8470 to master. Change-Id: I9ebcb6e3d51be922e08e5f867fb8dcaf5cb9788d