commit | 24113ce93ad6238250cdd1d0c247dae66f082249 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Dec 13 13:12:36 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 13 13:12:36 2010 -0800 |
tree | 66d37e7af33b650dfc2e6ffb05d5762f6455fe3e | |
parent | 48eca4c4dc95db7bf8a4d522158f516508562a96 [diff] | |
parent | b7f42b567b6d33b841783374147949051bc16f84 [diff] |
am 6d13b146: am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master * commit '6d13b146e0444f40f45b9fe5812093c5e611b68e': Added dropbox broadcast notification