commit | 3784d003b811a5a66424cc0f5f8ef4b279081359 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Mon Aug 23 12:01:51 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 23 12:01:51 2010 -0700 |
tree | 8e735d90f4626002d8d6a5630557b864132d06ac | |
parent | 2cd6aad5615af391e1b58db9faa9c9d76280d0b1 [diff] | |
parent | 805ad7d1aa3d5177b383af3ad49df20092d2ef9d [diff] |
am 805ad7d1: am 4749fcf7: More tricksy. Merge commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d' * commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d': More tricksy.