| commit | 9a9724c3be2199c54e7fcc6543bb41ba87af66ee | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Jun 10 11:54:53 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 10 11:54:53 2010 -0700 |
| tree | 051c32d0e34b34d50f3c5589ac2a20b822f2abb2 | |
| parent | 3a0b37a04e8c8cc2e1e2386023bc5ce77cd91625 [diff] | |
| parent | a2c6d5bf308181c019ade0aac6d25fe33dc3d76c [diff] |
am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken * commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c': do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch