Daniel Lehmann 22d7142dd9 am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo ...

Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken

* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
  Don't load photo if it's id is 0. Saves one database query

2010-03-30 17:05:42 -07:00

..

config

…

java

am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo

2010-03-30 17:05:42 -07:00

jni

Add some comments for zoom methods.

2010-03-29 16:21:12 +08:00

res

am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo

2010-03-30 09:38:14 -07:00

tests

relocate android.util.base64.* -> android.util.*

2010-03-29 13:46:47 -07:00