tree 10da860fcff71886af91d082e31f0e1917926848
parent c162dc410bdd66a695a1eff058f7280f04001ea4
parent b6c156fe19394c43c96a98c1fbb1fa4cfa5a91a6
author Adam Cohen <adamcohen@google.com> 1422666441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666441 +0000

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

* commit 'b6c156fe19394c43c96a98c1fbb1fa4cfa5a91a6':