OSDN Git Service

am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches
authorJohn Reck <jreck@google.com>
Tue, 16 Oct 2012 00:13:19 +0000 (17:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Oct 2012 00:13:19 +0000 (17:13 -0700)
* commit '94dbd96dea60224e2c3bc7c148af147fe3f83bcb':
  Fix build


Trivial merge