OSDN Git Service

am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Mon, 5 Nov 2012 23:49:50 +0000 (15:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:49:50 +0000 (15:49 -0800)
commit12aa029dd90d324f30e63308329e0436408211a1
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent56edac84dccbdc97bceefa21e17ab75febfc8f6e
parent1c4fafe902ef9b527abab4be992dcf253efc1701
am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev

* commit '1c4fafe902ef9b527abab4be992dcf253efc1701':