| commit | b7f42b567b6d33b841783374147949051bc16f84 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Dec 13 13:10:23 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 13 13:10:23 2010 -0800 |
| tree | 560b5dcb1a3b1dc694a176dd7fca8e7c63f77414 | |
| parent | 87f2c87d119fc8f0bd0fb97a8a9b820694f55915 [diff] | |
| parent | fae89a5076867dd2ab4d73abd959bbbf32a23336 [diff] |
am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master * commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8': Added dropbox broadcast notification