OSDN Git Service

am 0702c101: am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use...
authorScott Main <smain@google.com>
Wed, 20 Oct 2010 20:54:47 +0000 (13:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Oct 2010 20:54:47 +0000 (13:54 -0700)
Merge commit '0702c101253807064c177cdbfca80391b1a26aea' into gingerbread-plus-aosp

* commit '0702c101253807064c177cdbfca80391b1a26aea':
  Do not merge.


Trivial merge