tree 247a6042b9e60c34d8ad761672b6cdd2452fd415
parent ba6c2214970297b5af9bde22dd17d035a7c643e8
parent 56ecb64783b2637a0ff907c9459a7271881e5963
author Yang Ni <yangni@google.com> 1462557641 +0000
committer android-build-merger <android-build-merger@google.com> 1462557641 +0000

Merge "Avoid breaking on dead launch options" into nyc-dev
am: 56ecb64783

* commit '56ecb64783b2637a0ff907c9459a7271881e5963':
  Avoid breaking on dead launch options

Change-Id: Id2f2240d90a57cd20e4c4b4532624b6697306d38