am 6caf641c: Merge "Move layout and resource to sw485dp." into honeycomb-mr2

* commit '6caf641ce069e2e286c5a27062bc536b701ab313':
  Move layout and resource to sw485dp.