Adam Powell 42658ed518 am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable" ...

* commit '30ad720304790b07112b87f973a7e6ed5e1e6ee5':
  Consider mScrollX when drawing the checkMarkDrawable

2013-07-16 17:06:36 -07:00

..

java

am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"

2013-07-16 17:06:36 -07:00

jni

Mixed delete/delete[].

2013-07-03 19:26:23 -04:00

res

am 505565c3: Import translations. DO NOT MERGE

2013-07-03 11:35:02 -07:00

tests

resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:50:13 -07:00