| commit | 09d30981f8e882ffaa336aa4665bfe348557895a | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Jan 16 11:44:20 2014 -0800 |
| committer | Jeff Brown <jeffbrown@google.com> | Thu Jan 16 11:44:20 2014 -0800 |
| tree | f146e7f462d50382bc79e79c4ecb4f8681555bf7 | |
| parent | d3ee63b6c6999475288502ccd37eb8840fb8a1c0 [diff] | |
| parent | 6f357d3284a833cc50a990e14b39f389b8972254 [diff] |
resolved conflicts for merge of 6f357d32 to master Change-Id: I1979e6ed1acddbe656f5010114fd900f10865e75