OSDN Git Service

resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
authorJeff Brown <jeffbrown@google.com>
Thu, 30 Sep 2010 03:51:48 +0000 (20:51 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 1 Oct 2010 17:42:11 +0000 (10:42 -0700)
commit284e1954274b708f3cf60ab82cdabe0f4c31d141
tree915d4a48d0825eb5d43b63526e4af424346c140d
parent6a10d397f311f7816d29e9879eb1c020b8863821
parent4110368b935e51ebd75fff88492bbef451837383
resolved conflicts for merge of 4110368b to gingerbread-plus-aosp

Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137
samples/ApiDemos/src/com/example/android/apis/graphics/TouchPaint.java