am c112118a: Merge "move resources" into honeycomb-mr2

* commit 'c112118a9091aa69ea70fea7c23f1e078ee87908':
  move resources