OSDN Git Service

resolved conflict for merge from d42eeab2 to master
authorMichael Kolb <kolby@google.com>
Fri, 18 Apr 2014 01:00:40 +0000 (18:00 -0700)
committerMichael Kolb <kolby@google.com>
Fri, 18 Apr 2014 01:00:40 +0000 (18:00 -0700)
commitf4399e7243c35bef3eabfd20582246818a0bbbd3
tree5ae8daefe9034808e741201ca8638ab9ccb956d9
parent473917208961a90ca76fa9b9341b95902859b682
parentd42eeab20fea37fbf92b5c1a4f6f194ab9303083
resolved conflict for merge from d42eeab2 to master

Change-Id: I41bd238f0628110c923b79259de4cd11a783340c
core/java/android/view/ViewRootImpl.java
core/res/res/values/config.xml
core/res/res/values/symbols.xml