| commit | 1371ecced58ebea8b03468a8ea0df1de0984bf9f | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Nov 29 15:14:44 2011 -0800 |
| committer | Andreas Huber <andih@google.com> | Tue Nov 29 15:14:44 2011 -0800 |
| tree | 12628ec22bf1f54d78253b347e3e94b3ad8f0d20 | |
| parent | 9c59b5170a54d1a96617368fc3b394ee66671833 [diff] | |
| parent | 2f91d3ebcad7f4d02e4745469cba61c1b8a210e6 [diff] |
resolved conflicts for merge of 998a929a to master Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8