tree 6e900f7a13172e254be669ab3f570ad6cdfa62a3
parent 7d728371793f4f5fded25d152892466eefde569d
parent c6525f5e242717acd975fde8bd016eeda773647d
author Jie Cheng <jie.cheng@sony.com> 1510863645 +0000
committer android-build-merger <android-build-merger@google.com> 1510863645 +0000

Merge "Preference SimSettingsActivity not aligned correctly" am: 8d3d166823
am: c6525f5e24

Change-Id: I2516b9132982104ef870d79a7c63c7d002f036de