OSDN Git Service

Merge "Fix another build break."
authorHui Shu <hush@google.com>
Thu, 13 Mar 2014 23:35:42 +0000 (23:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Mar 2014 23:35:42 +0000 (23:35 +0000)
commit2ecd9fc969e35ec64461de1fbe9a0e10380e7cad
tree21c56a68b6ffb4ca73c1149ecdc2e003c89de541
parent70df4dc56a55984391a74a1f26294ed085ab26fb
parentec21c58574798d05693d053deb17778cf23d0050
Merge "Fix another build break."