am d85c4b34: Merge change Idb328ab7 into eclair

Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2

* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
  Explicitly specify that online-sdk depends on framework-res.