am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit 'e33044eadfa9969e71e50d1aff165cbc436b13f3' into eclair * commit 'e33044eadfa9969e71e50d1aff165cbc436b13f3': Explicitly specify that online-sdk depends on framework-res. (do not merge)
This commit is contained in:
commit
1d7f986a53