| commit | d5096c6a5c59a0f78833ea86b620bfbedc863aba | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 28 13:40:19 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 28 13:40:19 2012 -0700 |
| tree | 628f640c04ab8a9d9dda8ed696c8fb9ee1926563 | |
| parent | 6f4de4bd13f0acaaa8b7c59e141c28d64aba48f4 [diff] | |
| parent | 5c90337229ee75c8e4e99f59b42585a8fa5089db [diff] |
resolved conflicts for merge of 5c903372 to jb-mr1-dev Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7