tree 7ec339a33ab6ce6010edeabf0cbed6a0d98e9203
parent f603689c7ed502ff1db3b3c6959f3bd711eca5d3
parent 859ad76dc9ef6593e01e393012225e9c392d023c
author Wei Jia <wjia@google.com> 1512184391 +0000
committer android-build-merger <android-build-merger@google.com> 1512184391 +0000

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

Change-Id: I4a6fcc692b4e1e7053606d81c4315519aff07979