OSDN Git Service

am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
authorDianne Hackborn <hackbod@google.com>
Tue, 18 May 2010 22:26:17 +0000 (15:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 May 2010 22:26:17 +0000 (15:26 -0700)
commitfcc577b2a15c37c1bbed995c27a48594dc43dfef
tree19b9648ef327743ef3e119274fc638137b0820ec
parent75a43c605449e72074fc55576c8e712ff12906db
parentf9762a2c39bc4189329c89272bc83ba11c2c9624
am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP

Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp

* commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624':
  Fix issue #2694643: Remove/Resolve STOPSHIP
res/values/strings.xml