tree 3307a008447b5d504d57486828308ab2c4ee4c9c
parent 011bdc4006b80f65df923b68ea924bdbee85c731
parent 46d02d5596a7997f98f5d958f58dbf148aa56a85
author Dianne Hackborn <hackbod@google.com> 1410556805 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410556805 +0000

am 1379b508: Merge "Set up final resource identifiers." into lmp-dev

* commit '1379b5081522e03be4f2d9063321040945bed03a':
  Set up final resource identifiers.