| commit | a9aa02cc4cf7520aa2f4348235e3ff637fe024f3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Apr 24 18:50:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 24 18:50:18 2012 -0700 |
| tree | 023429b3d7e10d16ac3118b2fa928750a3179dbe | |
| parent | b579811b01322593470dd9c9f265860630073f34 [diff] | |
| parent | 307d9cfc1690ec4982152aae1b6bd24ff8e078ed [diff] |
am 307d9cfc: Merge from AOSP * commit '307d9cfc1690ec4982152aae1b6bd24ff8e078ed':