ServiceKeeper_Identity부여/동기화_개선 작업 중..
9월 1일 회의 내용 구현, MeasurementData 동기화 부분 구현
Sync transaction 추가
2014/09/05 13:35
Merge remote-tracking branch 'origin/database' into protocolNtransaction

Conflicts:
	BlinkLibrary/src/kr/poturns/blink/internal/MessageProcessor.java
Merge remote-tracking branch 'origin/UI' into protocolNtransaction

Conflicts:
	BlinkLibrary/res/values/strings_ui.xml
	BlinkLibrary/src/kr/poturns/blink/external/ConnectionFragment.java
	BlinkLibrary/src/kr/poturns/blink/external/DataSelectFragment.java
	BlinkLibrary/src/kr/poturns/blink/external/DataViewFragment.java
	BlinkLibrary/src/kr/poturns/blink/external/SqliteManagerExtended.java
Merge remote-tracking branch 'origin/service' into protocolNtransaction

Conflicts:
	BlinkLibrary/src/kr/poturns/blink/db/SyncDatabaseManager.java
	BlinkLibrary/src/kr/poturns/blink/db/archive/DatabaseMessage.java
	BlinkLibrary/src/kr/poturns/blink/internal/MessageProcessor.java
	BlinkLibrary/src/kr/poturns/blink/internal/comm/IBlinkMessagable.java