OSDN Git Service

am 5eca5f52: am cd7b8c13: Re-add a strings that should not have cleaned up.
authorSascha Haeberling <haeberling@google.com>
Fri, 6 Sep 2013 19:58:07 +0000 (12:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Sep 2013 19:58:07 +0000 (12:58 -0700)
* commit '5eca5f526f470be011c9e56603fe45df347d623e':
  Re-add a strings that should not have cleaned up.


Trivial merge