Justin Ho 4a21cabb9f Fixing naming for disabled paste assets ...

Updated paste assets

Bug: 4083486
Change-Id: I21bc469ef42c4eca4bcbea953f3c9e3a72b13388

2011-03-14 18:19:25 -07:00

..

config

…

java

Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1

2011-03-14 14:43:46 -07:00

jni

Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1

2011-03-11 16:31:55 -08:00

res

Fixing naming for disabled paste assets

2011-03-14 18:19:25 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00