OSDN Git Service

am 80f2b063: (-s ours) am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"
authorJason Chen <jasonchen@google.com>
Fri, 16 Mar 2012 23:35:56 +0000 (16:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Mar 2012 23:35:56 +0000 (16:35 -0700)
commitd6c1c58af29dd5ee9c67c35e19e157d4eb86c7a8
tree9e730197c1cf8bf4c3b80efcedf5f9b6a6e6117b
parent800d263c2d7737c75cb6f0b0bcf607f420d53934
parent80f2b06330accf1e4f51bc4846edf1e1409899f1
am 80f2b063: (-s ours) am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit '80f2b06330accf1e4f51bc4846edf1e1409899f1':
  [DO NOT MERGE] Revert "Update string in Settings"