OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51387db 8bbc1b6)
am 835f41da: (-s ours) am 8acdb911: Merge "Add support for GPS privacy lock. DO...
authorMike Lockwood <lockwood@android.com>
Wed, 31 Mar 2010 00:35:18 +0000 (17:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Mar 2010 00:35:18 +0000 (17:35 -0700)
Merge commit '835f41da7581747b6a03227bcd1e073074ea9329' into kraken

* commit '835f41da7581747b6a03227bcd1e073074ea9329':
  Add support for GPS privacy lock.  DO NOT MERGE


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help