OSDN Git Service

resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev
authorBryce Lee <brycelee@google.com>
Wed, 22 Oct 2014 23:56:08 +0000 (16:56 -0700)
committerBryce Lee <brycelee@google.com>
Wed, 22 Oct 2014 23:56:08 +0000 (16:56 -0700)
commitfb1cf36aa739da5dbebc64e61900e9ff96134e26
tree8679163a6017516b9b9ae2e12eeebbc1a59ab208
parent1eb6a2f075bfc0b65f0accf0f03661d7a5152593
parentf03ba4f13ba835c670d7c471f91a3083846ab082
resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev

Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
core/java/android/provider/Settings.java
core/res/res/values/symbols.xml
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
services/core/java/com/android/server/wm/WindowManagerService.java