OSDN Git Service

am c29ec0b4: am ae3e3188: Merge "Editing encryption strings." into honeycomb
authorRoy West <rwest@android.com>
Wed, 26 Jan 2011 23:46:12 +0000 (15:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 23:46:12 +0000 (15:46 -0800)
commit0251821a49c0b48b5f1bad2671bd04e1ecb59a11
tree607ebdd8411a1ccde99f096c397380912a6aaa3d
parent9def4c58ab8388a3f25cc7da36c2aeffacf61099
parentc29ec0b45ff38258b3190fdd5e586fee8039b828
am c29ec0b4: am ae3e3188: Merge "Editing encryption strings." into honeycomb

* commit 'c29ec0b45ff38258b3190fdd5e586fee8039b828':
  Editing encryption strings.