OSDN Git Service

am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change.
authorJim Miller <jaggies@google.com>
Fri, 17 Oct 2014 20:28:56 +0000 (20:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Oct 2014 20:28:56 +0000 (20:28 +0000)
* commit 'ae2ee1dd0537cb92d3df4568bc0cd82ef4663ad0':
  Add strings for upcoming change.


Trivial merge