tree db79ebdf38adba907d24af92565c5ae9b877c9f0
parent 8c63b496ec5cc47e6c364130af7b6ab1a3da254b
parent e72a7e1bc7451b5b67292f1fd0ce5e616a58988a
author Santos Cordon <santoscordon@google.com> 1412961175 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412961175 +0000

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

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