| commit | 52a7907f091f2991bb08f36294497f02dc3350d0 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Aug 30 14:29:13 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 30 14:29:13 2010 -0700 |
| tree | f5ed6e5f040010455e36e0cb8cf0c69efb3be3fb | |
| parent | 4ffc2eb9858fbce8558a52755b4e48a928399cce [diff] | |
| parent | 444d2643ddba8538c63e9964dc543774c8e6e800 [diff] |
am 444d2643: (-s ours) do not merge: cherry-picked 4ffc2eb9858fbce8558a52755b4e48a928399cce from master branch Merge commit '444d2643ddba8538c63e9964dc543774c8e6e800' into gingerbread * commit '444d2643ddba8538c63e9964dc543774c8e6e800': do not merge: cherry-picked 4ffc2eb9858fbce8558a52755b4e48a928399cce from master branch