OSDN Git Service

am ae3e3188: Merge "Editing encryption strings." into honeycomb
authorRoy West <rwest@android.com>
Wed, 26 Jan 2011 23:43:13 +0000 (15:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 23:43:13 +0000 (15:43 -0800)
* commit 'ae3e3188120eb89acc5dc0a06803ae8274aeb900':
  Editing encryption strings.


Trivial merge