tree 2f5244e61321a9f458d96cfe258e70f7f2d1fc85
parent 7b61daf5071910225289c10031d721fa9234680f
parent bf329143cabb50afad4d4be1b0ad1eedc816513d
author Santos Cordon <santoscordon@google.com> 1412882988 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412882988 +0000

am bf329143: Merge "Make OTASP an explicit option for carriers." into lmp-dev

* commit 'bf329143cabb50afad4d4be1b0ad1eedc816513d':
  Make OTASP an explicit option for carriers.