tree c9f74d930fab594d5a30e63f6a0302abac2f7830
parent a3211b9185f0ff19077d4db7864cc3b492e1da8c
parent 27b4e0f7d6f6f2bfacc4e2fcc66472540122939d
author Jeff Sharkey <jsharkey@android.com> 1398200696 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398200696 +0000

am 27b4e0f7: am 5aeef581: Add support for partner customization.

* commit '27b4e0f7d6f6f2bfacc4e2fcc66472540122939d':
  Add support for partner customization.