tree dd0973e5848ba1fe22369345f0c59b99a290e2aa
parent 1bcebeae71856c360972b86e1a22d53113bb3cc0
parent c5b6ac7215329d9f827731a43c330451f38b9965
author Adam Cohen <adamcohen@google.com> 1406786442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406786442 +0000

am c5b6ac72: am 2d7e7eda: Fix resource issue in folders of partner layouts

* commit 'c5b6ac7215329d9f827731a43c330451f38b9965':
  Fix resource issue in folders of partner layouts