| commit | 65ecb4436342291f8e19a647bc6bcee80dc6c925 | [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 | 4b405fa5c68998e8736df432e65b711e806ace84 | |
| parent | 332abc3055720afea153ef6a8eb29afadbcfd87c [diff] | |
| parent | d145249b4f7b32cd7f78899fd64ebb91e42389ef [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.