| commit | 17c61aaf4607f89e512d883c210cfcc0dc042f4f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 18:45:02 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 18:45:02 2010 -0700 |
| tree | 0012f40e683d43cbcac95d03d49b3a201a018231 | |
| parent | 474fe56acccc1372d1b21a7dbf74309005d699c6 [diff] | |
| parent | ecd4a4d09c71ba5c066929aee49e24cafa9fdad7 [diff] |
resolved conflicts for merge of ecd4a4d0 to gingerbread-plus-aosp Change-Id: I623544ad03ae1a750fac6b0f8a3427fc5590b5c9