tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 1a28297e2bf0c89774d20a8523ac4f64c50a9583
parent 7cb3e3f64e8b11527251dd03bb09d8bb0c47f488
author Mark Brophy <mbrophy@google.com> 1422685277 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685277 +0000

am 7cb3e3f6: am 287d82f1: am 37d1c0e1: am fd449c88: Make GEL not crashloop.

* commit '7cb3e3f64e8b11527251dd03bb09d8bb0c47f488':