Merge "Settings tweaks" into nyc-dev am: db3fcfb

am: 14b6f12  -s ours

* commit '14b6f12aeaaa00d35feee4e5b19f9b6792874c5f':
  Settings tweaks

Change-Id: I8b1c1cdcc17a6722c9aba2cb55956f0444f8b5fe
This commit is contained in:
Jason Monk
2016-04-09 22:44:01 +00:00
committed by android-build-merger

Diff Content Not Available