OSDN Git Service

am 1084e8c5: am a15b5195: am 99679734: am c6ea0400: Merge "Fix broken build" into...
authornicolasroard <nicolasroard@google.com>
Mon, 5 Nov 2012 23:42:45 +0000 (15:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:42:45 +0000 (15:42 -0800)
commit4ffdba591cd2f0ac88e1ae509a0adeb8c89bf218
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent236a2912f52074a898fdf41f1bd8296bd1f9efc2
parent1084e8c5baacf91eff4aa85b59d73d9ccfd993ca
am 1084e8c5: am a15b5195: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches

* commit '1084e8c5baacf91eff4aa85b59d73d9ccfd993ca':