commit | 805ad7d1aa3d5177b383af3ad49df20092d2ef9d | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Thu Aug 19 18:37:35 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 19 18:37:35 2010 -0700 |
tree | 4cec3baa39d7490dfaf73aaadcdeb616e03165e8 | |
parent | 2876ad62082207e0e02cbc38b65ce9993cb121bf [diff] | |
parent | 4749fcf762de0e34ac28f927501d42555062c521 [diff] |
am 4749fcf7: More tricksy. Merge commit '4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp * commit '4749fcf762de0e34ac28f927501d42555062c521': More tricksy.