tree 40bd781f2e8725ced879ba196081cef8946a6598
parent 5b6cba8c2ea6c2ae4180fa2bcc294133ee253355
parent 75d21f33d83a731955ea75449ac4cf2a5f0dc5cd
author Wei Jia <wjia@google.com> 1512184632 +0000
committer android-build-merger <android-build-merger@google.com> 1512184632 +0000

Merge changes from topic "Fix for 65483665 (lmp-mr1-dev)" into lmp-mr1-dev am: a54aa363c8  -s ours am: 859ad76dc9  -s ours am: 0d22f58bee  -s ours
am: 75d21f33d8  -s ours

Change-Id: I7454a92ec719ff1b3d3a6e7ed0b7e21ea93ea331