OSDN Git Service

am 12aa029d: am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Mon, 5 Nov 2012 23:53:16 +0000 (15:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:53:16 +0000 (15:53 -0800)
commit4337e14e56db00c0454c32a9551d479bb7836888
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent35a20e5e8bd7bd083e674ac4b4652e19f7e4819e
parent12aa029dd90d324f30e63308329e0436408211a1
am 12aa029d: am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev

* commit '12aa029dd90d324f30e63308329e0436408211a1':