tree 0d89c1e45954b6017a90fd78dd8b3d36a0e52b9a
parent 583521ec4348a7297b0a7a3e0bcc774e5a11164d
author Jonathan Basseri <misterikkit@google.com> 1464208385 -0700
committer The Android Automerger <android-build@google.com> 1464379771 -0700

Fix stuck automerge.

Bug: 28845064
Change-Id: I0d6b43d293c9ef72c9ce2e65c60093bd37a7dbc4