OSDN Git Service

resolve merge conflicts of b0c58aa to master
authorAndrew Sapperstein <asapperstein@google.com>
Thu, 21 Apr 2016 00:56:12 +0000 (17:56 -0700)
committerAndrew Sapperstein <asapperstein@google.com>
Thu, 21 Apr 2016 00:56:12 +0000 (17:56 -0700)
commit2524686c6696bf2aaa8745acdbddde30d1f442dc
tree4dfa5013bc4c3d8b3297bc1eb63b784f487156bb
parent1e3cc4a35d6126a85c90bf98bc6c447896c4ae8a
parentb0c58aa530d4df31b4f11984d38326e491800970
resolve merge conflicts of b0c58aa to master

Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
src/com/android/settings/SettingsActivity.java
src/com/android/settings/overlay/FeatureFactoryImpl.java