| commit | 994112e771f471983f1536d2236b42b4260a6663 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 30 12:15:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 12:15:42 2010 -0700 |
| tree | e18988807e2a960d5df43b63c4a54e5691eff010 | |
| parent | 84383376d87f89bc9ed7fe5351c6aa2cccd3e309 [diff] | |
| parent | 6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7 [diff] |
am 6a5ed6aa: am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread Merge commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7' * commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7': fix inaccurate copyrights