tree 9ec33db40e24d8aa2d49efc8c057065d0f225717
parent 340217e7ce3268a891ee5af87b0db3dbc1e7a31f
parent 86d8b8d02714db1eaefdfbecf9b0e8cd92fa79cf
author Jordan Liu <jminjie@google.com> 1562896742 -0700
committer android-build-merger <android-build-merger@google.com> 1562896742 -0700

Merge "Add a SubId to getDataState and getDataActivity" am: 9cdec92602 am: 8e67d8c9f5 am: 62c556a33c
am: 86d8b8d027

Change-Id: I91dc67ee2633e3ee1eac3e012928242c02315cc7