OSDN Git Service

am f38cb998: Fix conflict with other build fix
authorMichael Jurka <mikejurka@google.com>
Thu, 25 Oct 2012 20:24:50 +0000 (13:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Oct 2012 20:24:50 +0000 (13:24 -0700)
commitb83e3632acf59c2e790f6d22f7830891db44852b
tree73d663620adf7d80e407446bc5ea64afa3adce5a
parent8ee820827f9087dec7e82cdf75976330a62bbd06
parentf38cb998d6d35ce31a7aa446073e8488305812c2
am f38cb998: Fix conflict with other build fix

* commit 'f38cb998d6d35ce31a7aa446073e8488305812c2':
  Fix conflict with other build fix