OSDN Git Service

am d232a172: am 3e1bdc61: am 2280218a: Merge "Don\'t use string that has been removed...
authorJason Monk <jmonk@google.com>
Mon, 1 Jun 2015 15:46:32 +0000 (15:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:46:32 +0000 (15:46 +0000)
* commit 'd232a172ee34964b74a2ca400a247f37cca0c7f9':
  Don't use string that has been removed.


Trivial merge