commit | 179dd46e5de9dd61a9011708d262ca40012e9040 | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Mon Mar 14 10:53:38 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 10:53:38 2011 -0700 |
tree | 1c682135210ff543b511152425bc0406b754780d | |
parent | a64e2ad4da3612586594a19489a2b5d44f3f23a0 [diff] | |
parent | 2e7415564ad1d77537f9f3d5151ed480fcfc6ef9 [diff] |
am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread * commit '2e7415564ad1d77537f9f3d5151ed480fcfc6ef9': DO NOT MERGE Backport of I1f55df8a from master.