tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent a5b51c6dfcd6b7139133c1ea6b7ee81d457ccf30
parent c000a50baaf7d31b4fcf0d83e3b70b1a546876e2
author Adam Cohen <adamcohen@google.com> 1422669661 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669661 +0000

am c000a50b: am b6c156fe: am a66233ae: Merge "Add partner customization option to force first run flow" into ub-now-porkchop

* commit 'c000a50baaf7d31b4fcf0d83e3b70b1a546876e2':