| commit | 5f83cf0bcf96fc58ca7314571ae264353cdee321 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 22 13:45:10 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 23 07:43:47 2012 -0700 |
| tree | e1f45621f2deea233d7e61b9cc1674fff242f91e | |
| parent | 984d35703d5c6738253193bd53da9dedb3b58243 [diff] | |
| parent | a6405e9da2200f09c2d23270ab104ee22c25b046 [diff] |
resolved conflicts for merge of a6405e9d to jb-mr1-dev Change-Id: I2c698ec017f29c9ccc89231439cb6c8013914009