| commit | c32e190ea6da8c9acd8dc1a29a6e8794ecf7d857 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Jun 29 16:23:49 2012 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Fri Jun 29 16:23:49 2012 -0700 |
| tree | d337fdee137eb4d3f99412547949599045dff095 | |
| parent | 4efade8a85d1352d91dcb4f4be2c337223688840 [diff] | |
| parent | a9c3846194b69f1bfa73066be670c9d77f6dd0d7 [diff] |
resolved conflicts for merge of a9c38461 to master Change-Id: Ie7044c4f9f15384c3edd328fa8e2932c731d9d5c