OSDN Git Service

am 0437302f: Merge "Fix the build" into jb-mr1-dev
authorFabrice Di Meglio <fdimeglio@google.com>
Thu, 18 Oct 2012 22:41:30 +0000 (15:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Oct 2012 22:41:30 +0000 (15:41 -0700)
commit7fb1aac6b82c16a2417be2af019f211df85b1555
treeb98cfd1b394c4ac0f08dabe2b0dc13c88f76a1d4
parentac7806b9a78ed66c9a8fa23b6637c836925ebfe7
parent0437302f164f3eb1ba6a359ef5b3cd857facbbe4
am 0437302f: Merge "Fix the build" into jb-mr1-dev

* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
  Fix the build