| commit | 0c4a8476754d248c4d72aa88b9e33588ffc8fab4 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Dec 07 15:58:22 2015 -0800 |
| committer | Tyler Gunn <tgunn@google.com> | Mon Dec 07 15:58:22 2015 -0800 |
| tree | 8ece57144982467f62d2076c458aa8617d6b249f | |
| parent | 23657915e59886f144f19e55dec723f8d66576ac [diff] | |
| parent | 47c16d37c15c262e470a1d429ab934fccaeec340 [diff] |
resolve merge conflicts of 47c16d37c1 to master. Change-Id: Ib1c968d20529ffcd5a16179944e1ec9fd27ab3a6