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

* commit 'a2a605a958ae8443e54b7a2607bc71501682f9ae':
  move resources