| commit | bba1694d5bf3ef1c08928692b193b1b080e3224a | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Fri Dec 21 14:28:37 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 21 14:28:37 2018 -0800 |
| tree | 18b49dc26d5b70efbd55edb875d165718e8b9b58 | |
| parent | 7f244606aa1ee3eaa8c7eb0cf17af9c018a2bf5b [diff] | |
| parent | 5151b7df4e577903cd8bc8289805c047ef694f57 [diff] |
[automerger skipped] Merge "SubscriptionInfo contains int cardId" am: 97c9aba888 am: 212e2576e1 am: 5151b7df4e -s ours Change-Id: I4cc1de8dc513c4485ea97c6df2c559ad395b02f7