| commit | 6d13b146e0444f40f45b9fe5812093c5e611b68e | [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 | 718855b74e2ccc8839b8722c2f26d60b39268b3d | |
| parent | 6c2471649b5b1d1d9c19305a43676161823b623a [diff] | |
| parent | e78a000955c283509ee8a21b8b7e448060ac8dd8 [diff] |
am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master * commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8': Added dropbox broadcast notification