tree 10da860fcff71886af91d082e31f0e1917926848
parent 61677b41eb12afd0d6950771d5a18f1d33e339be
parent 2b69b70d7cb2a1c67b527f094820fb3497a3709f
author Adam Cohen <adamcohen@google.com> 1422666432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666432 +0000

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

* commit '2b69b70d7cb2a1c67b527f094820fb3497a3709f':