Adam Powell a8b6dad8e5 am 4af1de39: am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread ...

Merge commit '4af1de39ab36cbff08075e654db516526ff9038d'

* commit '4af1de39ab36cbff08075e654db516526ff9038d':
  Fix bug 3064135 - do not allow text handles on TextViews in sub windows.

2010-10-13 23:34:54 -07:00

..

config

…

java

am 4af1de39: am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread

2010-10-13 23:34:54 -07:00

jni

Add a getNativeMatrix() API.

2010-10-13 13:40:37 -07:00

res

am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread

2010-10-13 23:34:21 -07:00

tests

resolved conflicts for merge of 8bb7a1df to master

2010-10-13 15:43:51 -07:00