| commit | 5942ccf0d8aa8adfb48b2c0de4e19966553c65a6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 17 14:52:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 17 14:52:21 2010 -0700 |
| tree | 918fcce6ef684d3f78fe70a5a3cefe8176ed3222 | |
| parent | f62b6ff9da05e8f9f6f2d39d2187b39cd16d934b [diff] | |
| parent | 9eb7a72253295d5e52151f4e8cdeddd6253e3998 [diff] |
am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken