OSDN Git Service

am 3b98f4b1: am 5a3399de: Merge "Fix ImageWriter::ComputeEagerResolvedStringsCallback()."
authorVladimir Marko <vmarko@google.com>
Wed, 11 Feb 2015 10:17:35 +0000 (10:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Feb 2015 10:17:35 +0000 (10:17 +0000)
commit0d0fa34fd7b2c90414ddb79b512a7c47305dfec4
tree5919e43c0584015aa47b6e15092d9446c9da4ee5
parent10a414f240cebd63e56cca6695138e33aa734c26
parent3b98f4b15a0787a325b9a98d061692fd2ecd5df7
am 3b98f4b1: am 5a3399de: Merge "Fix ImageWriter::ComputeEagerResolvedStringsCallback()."

* commit '3b98f4b15a0787a325b9a98d061692fd2ecd5df7':
  Fix ImageWriter::ComputeEagerResolvedStringsCallback().