OSDN Git Service

am 71d8d800: (-s ours) am 1441f89d: Do not merge -- restrict text selection to the...
authorCary Clark <cary@android.com>
Wed, 15 Sep 2010 23:49:42 +0000 (16:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Sep 2010 23:49:42 +0000 (16:49 -0700)
commit3c447915a3d7e8016662d0e8776290155fb1a0af
tree9939c073f9bcf9bc797761525a99b7b4dfe504bd
parent9afff8a5bbf96226a3f0a8970a235da6c3199b33
parent71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479
am 71d8d800: (-s ours) am 1441f89d: Do not merge -- restrict text selection to the main layer

Merge commit '71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479'

* commit '71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479':
  Do not merge -- restrict text selection to the main layer