OSDN Git Service

resolve merge conflicts of 957bdc56c5 to master.
authorRaph Levien <raph@google.com>
Wed, 13 Jan 2016 01:45:34 +0000 (17:45 -0800)
committerRaph Levien <raph@google.com>
Wed, 13 Jan 2016 01:45:34 +0000 (17:45 -0800)
Change-Id: I4c8749f92a1fa39bf0d08e10155d9e68c87401c0

1  2 
core/java/android/text/Layout.java

Simple merge