OSDN Git Service

am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text...
authorGilles Debunne <debunne@google.com>
Fri, 4 Feb 2011 23:54:19 +0000 (15:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Feb 2011 23:54:19 +0000 (15:54 -0800)
* commit '1ba2a47b82b950934ddf04570fb24124aec7f249':
  Blinking runnable is created only if text is editable. DO NOT MERGE.


Trivial merge