[automerger skipped] Merge "Migrate to TelephonyStatsLog from StatsLog" am:...
[automerger skipped] Merge "Migrate to TelephonyStatsLog from StatsLog" am: ad44b780 am: d6301526 -s ours am: 68dd8067 -s ours
am skip reason: Change-Id I7d926a3f3650240e82bfab2bbc17ff6ce6af52cc with SHA-1 ecc96af9 is in history
Change-Id: I25447cb1bfd6a3dc370c712d9e36245c8ed2dcdf