Sanket Padawe 1aa65f3b92 Fix build failure. ...

+ Merge commit 'a049c988e75a0bb496b587ade60930c4d40e4aaf' into
manual_merge_a049c98

Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145

2016-10-17 11:39:03 -07:00

..

com/android/settings

Fix build failure.

2016-10-17 11:39:03 -07:00