tree 15a8d1d5a2ffedaec805a716c04319d3e323d6f3
parent 0e1f4813bded7d81d3726554a155535c1442fd14
parent a7075f96d0cc9610c06680ea1d241f6c0a8c69ae
author Winson Chung <winsonc@google.com> 1337883210 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337883210 -0700

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

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