tree 3fb366cf6340eb876e882674039244dc9980af74
parent 0e32a3ff217f587372d3584ab16e881bb54f05d6
parent 0ff9f5ce911a34e77ee4dd18fc89405c82990539
author Jordan Liu <jminjie@google.com> 1563223854 -0700
committer android-build-merger <android-build-merger@google.com> 1563223854 -0700

Merge "Use public noteOp method" am: e7ef456000
am: 0ff9f5ce91

Change-Id: I4c5d10eb503d877c2c4555c5204ba133c7bcba2d