OSDN Git Service

Merge "Fix build break." into gb-ub-photos-bryce
authorGeorge Mount <mount@google.com>
Tue, 5 Mar 2013 00:11:03 +0000 (00:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Mar 2013 00:11:03 +0000 (00:11 +0000)
commit9c223cf1072172845c9118fac028371b5a57919a
tree52225f9630b858f81a9de156fffaa40e0acbbdfb
parentc882c3fec7409a40d4b4ff401fcfa81be7684424
parent8c8e86dcb25cd65631d461940ce93bccabecf473
Merge "Fix build break." into gb-ub-photos-bryce