tree df91bdf1a4f6c51849788e26eaabdee19ddb9cdc
parent 5274b98367a488d09400fb6187be0cd6aab25334
parent 9bc8f5bf2cdf30be5f477db872003ac3b8005c9f
author Adam Cohen <adamcohen@google.com> 1409941788 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409941788 +0000

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

* commit '9bc8f5bf2cdf30be5f477db872003ac3b8005c9f':
  Add ability for Partner customization apk to override certain DeviceProfile params