| commit | f84b25243d7ebeaca8424171f5ca3b192cc76d80 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 07 13:23:26 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 07 13:23:26 2011 -0700 |
| tree | 5bfdb16d111ab15cba3fd4466579b17f6a7d2e68 | |
| parent | a94d954862fab26f6159ed7bb836ba6758a569fd [diff] | |
| parent | 6ebedf0053ccefd414e5887db316f84bd8f6c44c [diff] |
am 6ebedf00: am 82da01d6: Merge from gingerbread * commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':