Robert Greenwalt 60307f1ac0 am 27c8b559: am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev ...

* commit '27c8b559b6feaa6ea5c44acc476a714487f1eafa':
  Don't back up the scan-always setting.

2013-05-08 15:03:10 -07:00

..

java

am 27c8b559: am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev

2013-05-08 15:03:10 -07:00

jni

libutils clean-up

2013-05-07 17:09:46 -07:00

res

Import translations. DO NOT MERGE

2013-05-08 08:31:18 -07:00

tests

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

2013-04-29 23:09:03 -07:00