| commit | ae9bf8dd4231e61e5e808664cc444576ec42c02a | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Nov 07 21:25:26 2013 -0800 |
| committer | Jeff Brown <jeffbrown@google.com> | Thu Nov 07 21:25:26 2013 -0800 |
| tree | 05da9a3c3e429cd390a263bb88f5f055b34b3e1b | |
| parent | 42ae5f3196966ce86930f384862ef71bfad16be3 [diff] | |
| parent | 6a1a2f9b880ee83d67208725c22ec4a7b321ed0a [diff] |
resolved conflicts for merge of 6a1a2f9b to master Change-Id: Ie204a484b9b989a66423b756bb4743d7018c0884