tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent f9525ebcdefb40a003e872a3a6f3a48374699eeb
parent 8562283acdb08fb4a68c23b78789d9e75e5f1fb6
author Adam Cohen <adamcohen@google.com> 1422669653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669653 +0000

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

* commit '8562283acdb08fb4a68c23b78789d9e75e5f1fb6':