| commit | d3aba52ce623338ce2dfc9e88e39923962cbd0cf | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Feb 05 08:30:01 2016 -0800 |
| committer | Kenny Root <kroot@google.com> | Fri Feb 05 08:30:01 2016 -0800 |
| tree | a8b70828d0e1553a416883cf365bec5c4d0d8010 | |
| parent | f7d75f67f370d0840c8b5829eec474c0180ee192 [diff] | |
| parent | c7a36097b73a0df89b22df1ad93f790a7c9d40d7 [diff] |
resolve merge conflicts of c7a36097b7 to master. Change-Id: Ie896efde5f922c7c69cfbc201815a21d13bba02d