commit | 0093da6b1e80d7b7beea219c8239698d97d9bb84 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Thu Jan 27 08:12:36 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 27 08:12:36 2011 -0800 |
tree | 6a90d2de1dbfdd2e78815cffa70373fa433f56c1 | |
parent | 6c556df3d0038ce26ae12e572d82acbc03be7366 [diff] | |
parent | b1f1d0ede6b54250970525646f25f4c74dcff02c [diff] |
am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread * commit '83fdc69ea0beb715dd45f0a4285cb5d780f8018a': Squash commits of the following patches, cherry-picked from other branch - do not merge.