tree 67c5eafeacd0633480b78caf6f776dff06961102
parent e7e95b69677362e9d78d255dbb06ea98d961d132
parent 4c3e0ccfa55dd1ffb10b090006fc1874d7339486
author Hall Liu <hallliu@google.com> 1551919802 -0800
committer android-build-merger <android-build-merger@google.com> 1551919802 -0800

Merge "API tweaks" am: f3fbbeaa05
am: 4c3e0ccfa5

Change-Id: I03b0fdf8c90ccc0455087538565b51934c855c28