OSDN Git Service

resolved conflicts for merge of b9d21d62 to master
authorRaph Levien <raph@google.com>
Mon, 8 Dec 2014 21:46:15 +0000 (13:46 -0800)
committerRaph Levien <raph@google.com>
Mon, 8 Dec 2014 21:46:15 +0000 (13:46 -0800)
commit1a91d8df50562510084cd041501a3099f962a71c
tree9146a274016b0cd156189c3e72148ea96b255466
parent8f51036c4503955d1f294b6e7200af7b9b614b4a
parentb9d21d623f8bb196831d6fabdd5bb2ecf73a0c31
resolved conflicts for merge of b9d21d62 to master

Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2
core/java/android/text/StaticLayout.java