tree 50bcb9ae762827c17b0b63f3aa5e1fb6e4c2c15c
parent fb2f785ccb39c7a67ed20837c2abf85c80000378
parent 7f17e3fe4c9d56dbed4eac91f06a8fea6aee6f10
author Android Build Merger (Role) <android-build-merger@google.com> 1486680603 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486680603 +0000

Merge "DO NOT MERGE Set Settings.Global.CELL_ON default to CELL_ON_FLAG if not defined. am: 89dd33541f am: 8545602ec8" into nyc-mr2-dev-plus-aosp