commit | 57ea21df977b3ff3c014ae20b838e9617dea3573 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Thu Feb 03 18:09:36 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 03 18:09:36 2011 -0800 |
tree | 9deab5762327530c5c1a7dd5d39bd30fdd74ee74 | |
parent | 0f48ab8509126199e5465580623cabc8177b594a [diff] | |
parent | b102ed2bcfc91116cef48a3d4e8cfefbcb4ad962 [diff] |
am 5c97e9d9: am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread * commit '5c97e9d98566fcd4b6a702252223bb85d637259f':