tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 6f719cf3d7b91db77c1af6d56a635cb8a8e7fc1a
parent bbdd3ebd312f03343d58f8d2ee7918960363bfb6
author Adam Cohen <adamcohen@google.com> 1422685268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685268 +0000

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

* commit 'bbdd3ebd312f03343d58f8d2ee7918960363bfb6':