| commit | b8c6405fda9c41541868773f40ddd29bb1fc7ed8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 11:01:19 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 11:01:19 2012 -0700 |
| tree | 83c9dfae90f47a57c84cd668f90291ad5437f385 | |
| parent | 3857681e5885b64e593dcc3e28492b156d860ed3 [diff] | |
| parent | cddaf4d572ab5de2635b5d0efeda3ce42b97ddd0 [diff] |
resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp Change-Id: I973d361a9599b32f9eaced0748d984900590ea3d