OSDN Git Service

Merge "Fix build."
authorElliott Hughes <enh@google.com>
Wed, 10 Jul 2013 00:48:52 +0000 (00:48 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Jul 2013 00:48:53 +0000 (00:48 +0000)
commit0f50cb31980c8354a4516094863c4ad0cdd0d03b
treeb4a8b97a054db24e5d41ccea70c25c6a278e1fe0
parent4a59376d5ee031e930e61292ed9e92e96e956724
parentbfa5465ed2a67da47caf4df58f29629865b7ecac
Merge "Fix build."