| commit | 47eade6b68ddd7472fe76453d6c2fec1a5381a65 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Dec 20 13:20:30 2013 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Fri Dec 20 13:20:30 2013 -0800 |
| tree | 52261719997552c4314ff1dea45c027122caf33b | |
| parent | f572e28cacc367d0e98fcea5ed6e417803f10830 [diff] | |
| parent | 08f873c9cd6fe858677cae98c9554cc4f10fa855 [diff] |
resolved conflicts for merge of 08f873c9 to master Change-Id: I6ed68cc1c15ddaeb9bf7cb0dbfffa21abbd0eee9