tree cc5ece11169cb6c5094f89cfe2a98420870d6f2d
parent b145e363ff4e00048cdc9035300a6db05aa0fbb5
parent d31da0a670a60722339faa18e1147adb9c14532d
author Eric Fischer <enf@google.com> 1330551051 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330551051 -0800

am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.

* commit 'd31da0a670a60722339faa18e1147adb9c14532d':