OSDN Git Service

resolved conflicts for 0fb3f695 to master.
authorJorim Jaggi <jjaggi@google.com>
Thu, 10 Sep 2015 01:38:54 +0000 (18:38 -0700)
committerJorim Jaggi <jjaggi@google.com>
Thu, 10 Sep 2015 01:40:05 +0000 (18:40 -0700)
commit00cd47a2d2147eaba031771fd7e8b6fdbf25cf46
tree6c44151e41d25d15f1a2005dced3a7916a8fc3a6
parent2e846c25b3a414faa936248f81fc43a495d0d072
parent0fb3f695cc273d6c97e7d80c0ac25d8fac263d3a
resolved conflicts for 0fb3f695 to master.

Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a
core/java/android/provider/Settings.java
core/res/res/values/config.xml
core/res/res/values/symbols.xml
services/core/java/com/android/server/policy/PhoneWindowManager.java