tree 7298caa7e62f91e794a9dff9103337195187f27f
parent adfda46e9b07df1144d7e4013d41adab6743e9e6
parent f364048b955abbea93ee72bc1f1669d20799f332
author Calvin Pan <calvinpan@google.com> 1544289227 -0800
committer android-build-merger <android-build-merger@google.com> 1544289227 -0800

[automerger skipped] Merge "Fix cursor leak in TelephonyProvider" am: 46f8429df0 am: 3166b75108
am: f364048b95  -s ours

Change-Id: I8a59d91fb82cdbfe99dcbeae0d0ff2c9af6ef11a