Mike Lockwood 835f41da75 am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo ...

Merge commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp

* commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
  Add support for GPS privacy lock.  DO NOT MERGE

2010-03-30 17:32:24 -07:00

..

config

…

java

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:01:45 -07:00

jni

Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo

2010-03-30 17:29:41 -07:00

res

Merge "Import revised translations" into froyo

2010-03-30 09:23:16 -07:00

tests

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

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