Daniel Sandler 245f8a9501 resolved conflicts for merge of 5fa473cd to master ...

Change-Id: I097ac206c5232b0596d9d81baad3a501492335ca

2013-10-14 14:25:26 -04:00

..

java

am 5d96f61a: am c12f46eb: am 5db566f1: Fix updating fast scroll state for data set changes

2013-10-14 10:53:07 -07:00

jni

am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

2013-10-10 19:27:03 -07:00

res

resolved conflicts for merge of 5fa473cd to master

2013-10-14 14:25:26 -04:00

tests

…