OSDN Git Service

am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
authornicolasroard <nicolasroard@google.com>
Thu, 18 Oct 2012 23:05:02 +0000 (16:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Oct 2012 23:05:02 +0000 (16:05 -0700)
* commit 'c6ea040010a0794bc78a43c4522cfb03d9e488e2':
  Fix broken build


Trivial merge