| commit | 4713d3dc48cec162f4aeb3513719a8dd153e8c85 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Apr 12 09:39:00 2013 -0700 |
| committer | Andreas Huber <andih@google.com> | Fri Apr 12 09:39:00 2013 -0700 |
| tree | b1f77b377dd4e0abf3649f80bcbd9f3755d7a60e | |
| parent | 2e05ce2fefade35a4f3728f2ba94bcb18d0c580a [diff] | |
| parent | 1e04c248c6a4e69c10b5b8c9c15a9e68208746c2 [diff] |
resolved conflicts for merge of 1e04c248 to master Change-Id: I9a1292eaec2f12cb7636c27a53068672694c2236