tree df91bdf1a4f6c51849788e26eaabdee19ddb9cdc
parent c665e3637b19b4d49b88d037adf5d101ab39f354
parent a3b8866c5e341e1c140ae0740bd7fcfea5b67f81
author Adam Cohen <adamcohen@google.com> 1409907695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409907695 +0000

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

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