OSDN Git Service

Merge "Fix the build" into jb-mr1-dev
authorFabrice Di Meglio <fdimeglio@google.com>
Thu, 18 Oct 2012 22:37:26 +0000 (15:37 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Oct 2012 22:37:26 +0000 (15:37 -0700)
commit0437302f164f3eb1ba6a359ef5b3cd857facbbe4
treefa0178eb370eb68bcb988807bb1a8111e91f5358
parentd8149b03a8676a49f6ca500eecafe79fadf046a7
parent3cb8d26bb0f024e8535e9e1266a5394e4f8c4628
Merge "Fix the build" into jb-mr1-dev