tree 063099f0378bec79901895252b6711e8adfe5987
parent 3545b8a20314afd07ea3ca7044b889e3e9e8d37c
parent 6bfe2e7e8caaed97d6d4255059dc6d9e7bfeab04
author Yao, Yuxing <yaoyx@google.com> 1520374418 +0000
committer android-build-merger <android-build-merger@google.com> 1520374418 +0000

Merge "Fix UXR related behavior." into oc-mr1-jetpack-dev
am: 6bfe2e7e8c

Change-Id: If45f41a568fc13368a93e5b5545113236a66f6f3