OSDN Git Service

am 9a7f7a34: am 4f903c3e: Add strings for upcoming change.
authorJim Miller <jaggies@google.com>
Mon, 27 Oct 2014 18:53:13 +0000 (18:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:53:13 +0000 (18:53 +0000)
* commit '9a7f7a34aea8ef49564c160cbc8d9bed43407c9c':


Trivial merge