OSDN Git Service

am 6d13b146: am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 13 Dec 2010 21:12:36 +0000 (13:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Dec 2010 21:12:36 +0000 (13:12 -0800)
* commit '6d13b146e0444f40f45b9fe5812093c5e611b68e':
  Added dropbox broadcast notification


Trivial merge