| commit | 8c60aa385359a53ad8e23dd093114da6f4a55469 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Sep 17 14:52:27 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Sep 17 14:52:29 2012 -0700 |
| tree | d50766d5f08027a99850339ff27ab9b7da6a2810 | |
| parent | 0b894b30859cb131f5fa8300fd7f7806b4429082 [diff] | |
| parent | 5f6a33da9e648aeaa247a4871fad5e1b2645de1f [diff] |
resolved conflicts for merge of 5f6a33da to master Change-Id: I4803edf72913ada72bddb63f247b77e271f17baa