| commit | bd17928afcbead00b498a75a92a0a32a6cca7fee | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Thu Dec 17 19:01:37 2015 -0800 |
| committer | Bryce Lee <brycelee@google.com> | Fri Dec 18 03:05:20 2015 +0000 |
| tree | 8b38274ba3434c3fc8fdc84c014db18777b93266 | |
| parent | be4904962eac3a2cd54c73629884c5892eb0379e [diff] | |
| parent | 6b9e5bf0c29d5a56cc2a4f6586c426a9111b2c93 [diff] |
resolve merge conflicts of 6b9e5bf0c2 to master. Change-Id: Idada49313619533bfeb375ee232c942589457fa4