| commit | 9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d | [log] [tgz] |
|---|---|---|
| author | Jonathan Basseri <misterikkit@google.com> | Thu May 26 23:13:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 26 23:13:17 2016 +0000 |
| tree | 7c9399e00428d8ebfb99317df80bb274c42a892d | |
| parent | 09c511f039d9197da6a0fabdfadae47a10bbbeb1 [diff] | |
| parent | 04c35e78dbd5bc6670b5bf4e72686f696745af13 [diff] |
resolve merge conflicts of 4c04097 to nyc-mr1-dev am: 04c35e78db * commit '04c35e78dbd5bc6670b5bf4e72686f696745af13': Change how TelephonyManager handles subscriptions. Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d