tree f970a8b52bc316eb7a3325ed9507a7caa9195fd4
parent 8c30fbae6d3b1e48e6f97dd605ba801aa314fbe0
parent bf59b843f47bd560d0550e4b6ae629c27973fa63
author Grace Chen <chengrace@google.com> 1547234399 -0800
committer android-build-merger <android-build-merger@google.com> 1547234399 -0800

[automerger skipped] Merge "Add profile class in SubscriptionInfo database" am: 1403b61c05 am: ec0c47f5e7
am: bf59b843f4 -s ours
am skip reason: change_id I28a6d64c90db94ef0735f4d97f430560b733e797 with SHA1 c3eb446c52 is in history

Change-Id: I1c5dbb353f82dd5d3a3b7f5b0115f0a1fe81c52a