tree 15a8d1d5a2ffedaec805a716c04319d3e323d6f3
parent 1e2abeafb96fecadb709c63d430c21b56c5be451
parent bd247198516be22cbf56b1a828c7dd43f9848591
author Winson Chung <winsonc@google.com> 1337880380 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337880380 -0700

am bd247198: Merge "Fixing issue with resource ids. (Bug 6532243)" into jb-dev

* commit 'bd247198516be22cbf56b1a828c7dd43f9848591':
  Fixing issue with resource ids. (Bug 6532243)