OSDN Git Service

am 4efffd39: (-s ours) am a34e4dfd: Merge "Build camera tests as both 32 and 64 bit...
authorNarayan Kamath <narayan@google.com>
Fri, 6 Jun 2014 10:25:21 +0000 (10:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Jun 2014 10:25:21 +0000 (10:25 +0000)
commit74dc75872192d4b0ac17b8f456a321e34dd41b42
treef4b27eed25f135fac51ac9000b229c066b1f1466
parentc21098a0100cb5bb4371a0e1193bd516806f741c
parent4efffd39dc446a91a78ee019f6310e6b7791277e
am 4efffd39: (-s ours) am a34e4dfd: Merge "Build camera tests as both 32 and 64 bit binaries."

* commit '4efffd39dc446a91a78ee019f6310e6b7791277e':
  Build camera tests as both 32 and 64 bit binaries.