OSDN Git Service

resolved conflicts for 5d0e02b6 to cw-e-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 10 Sep 2015 00:49:57 +0000 (17:49 -0700)
committerJorim Jaggi <jjaggi@google.com>
Thu, 10 Sep 2015 00:49:57 +0000 (17:49 -0700)
commit5a9bb9516d016549730d49cddcc2b2ee0e7a4e93
tree2f38d805a16b47bf101f03fe97af65c6685cb012
parent5b9f8dd73fc08ac738002b5259bbfdbae8839b49
parent5d0e02b64e5b860e989268d1e7fd882e5fd47919
resolved conflicts for 5d0e02b6 to cw-e-dev

Change-Id: Id974d29581304dc644659d1c470b5413d847944b
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