From: Megha Joshi <mjoshi@google.com>
Date: Wed, 3 Feb 2010 20:34:37 +0000 (-0800)
Subject: am 74ccbf7a: am ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
X-Git-Tag: android-x86-2.2~127
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db516aab78f6a57450f5a22bae409719e502afd6;p=android-x86%2Fndk.git

am 74ccbf7a: am ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair

Merge commit '74ccbf7aa77213d6df41990936d5f30eb06afe43'

* commit '74ccbf7aa77213d6df41990936d5f30eb06afe43':
  SampleSyncAdapter sample code.
---

db516aab78f6a57450f5a22bae409719e502afd6