tree c028bfe537607823c37e2ffc8c713c73059d3130
parent e7d327aa0c7767dbbf94693a7f394702aaea6ae3
parent f0fd0c64a4fa41719585455d1f8420c253444447
author Adam Cohen <adamcohen@google.com> 1422685329 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685329 +0000

am f0fd0c64: am e61fbc92: am 9bc8f5bf: am a3b8866c: Merge "Add ability for Partner customization apk to override certain DeviceProfile params" into ub-now-porkchop

* commit 'f0fd0c64a4fa41719585455d1f8420c253444447':