bug:9896815 bug:10100304 bug:10097969 bug:10101601 Conflicts: core/res/res/values/config.xml Change-Id: I6165f42b2a3d7f4bbd16c97f7a2b8760a688e2d4
bug:9896815 bug:10100304 bug:10097969 bug:10101601 Conflicts: core/res/res/values/config.xml Change-Id: I6165f42b2a3d7f4bbd16c97f7a2b8760a688e2d4