tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 1c0207537dbf20cf8f9c07056d490dc9d6edb6a8
parent e61fbc929fc3453da00995410ccc0c33b0db49e6
author Adam Cohen <adamcohen@google.com> 1422669706 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669706 +0000

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

* commit 'e61fbc929fc3453da00995410ccc0c33b0db49e6':