tree cc76a40025c2189fc70dd6edd4a0eba251fd7b44
parent ea41bcf7a3a9095feb39cc6bd37d865c2eec3c36
parent a63ccea6abc7ea02e2d98e41c80793ca97237bd3
author Xin Li <delphij@google.com> 1510690377 -0800
committer Xin Li <delphij@google.com> 1510694385 -0800

Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40
Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99