tree 538ea5ea691e817e21408ac04718e76780126516
parent 0f325f7cbe122cd4c392368a0f61fd99615f1177
author Dave Weinstein <olorin@google.com> 1465927501 -0700
committer The Android Automerger <android-build@google.com> 1465949428 -0700

Resolve a merge issue between lmp and lmp-mr1+

Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503
(cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0)
(cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)