OSDN Git Service

resolve merge conflicts of c408ab3de6 to nyc-dev
authorLorenzo Colitti <lorenzo@google.com>
Wed, 17 Feb 2016 13:27:56 +0000 (22:27 +0900)
committerLorenzo Colitti <lorenzo@google.com>
Wed, 17 Feb 2016 13:32:33 +0000 (22:32 +0900)
commit6ef09978adb4c660001ca9cabd6e8b9653d87c18
treeb73bb3cdcad0250276d240f58ee545d22f6e5aed
parent4d2186a9b3e114a19c3931ef192051e734acfef6
parentc408ab3de6752513d5fe0750f211082fa91d4115
resolve merge conflicts of c408ab3de6 to nyc-dev

Change-Id: I647195694e4c2c8dd886246143ef9f9ac7a79a62
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java