| commit | 401a65b7846fb87991142d9caa4a6176f75bbe27 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 07:58:42 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 07:58:42 2012 -0700 |
| tree | 90f376f8c3ddddd393f7076c7d3a719fa995811c | |
| parent | 98a05b894e6f2981816a87ea0dbd6a3092d5c507 [diff] | |
| parent | 45cb1b0a85458dd80fb321c7fa0502e3bd33eaa5 [diff] |
resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp Change-Id: I50fb4331347a1921a5a75eb91a216c7e0499e2d6