tree 10da860fcff71886af91d082e31f0e1917926848
parent a21882dcfa0786a3f54ceaa4f5d8808173c477cf
parent 9bc8f5bf2cdf30be5f477db872003ac3b8005c9f
author Adam Cohen <adamcohen@google.com> 1422666496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666496 +0000

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

* commit '9bc8f5bf2cdf30be5f477db872003ac3b8005c9f':