| commit | ca268875c14909f7de66386aa7691d68cbb1b70f | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Thu Mar 03 17:25:12 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 03 17:25:12 2011 -0800 |
| tree | d643aa7a1f55424c74f2d503ad41dacfb45e5fb6 | |
| parent | a134afba0d49e487663dbdacf3d80d8ef9c52593 [diff] | |
| parent | 668e2e98473dbdd0e3dcb259db42419e66cb3cd5 [diff] |
am d145249b: (-s ours) am c91437d3: do not merge: Cherry pick change I878192090 from master. * commit 'd145249b4f7b32cd7f78899fd64ebb91e42389ef': do not merge: Cherry pick change I878192090 from master.