| commit | 09a49faead475dc54b460f7a22da5ae7b4773092 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Feb 03 13:32:08 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 03 13:32:08 2011 -0800 |
| tree | 12a552a7b5527f5337adab29948ca5123dfbece3 | |
| parent | 3c988fc39c7f75e8c2ee3ba3badf0c56cf486957 [diff] | |
| parent | 70ca70dee28486c48e141a0c33fd254f587a990a [diff] |
am 375afcd5: am 4b8ad9ef: Merge from gingerbread * commit '375afcd5d69f47c85960270bf51b83a2b768d446':