OSDN Git Service

Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"
authorBill Yi <byi@google.com>
Wed, 24 Sep 2014 16:46:40 +0000 (16:46 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 24 Sep 2014 16:46:41 +0000 (16:46 +0000)
commit1829a4b4d16e1bf37650e34ad6bbc54b68145e15
treeaf0890939540b5f05011eb3bf6b9128d81298b7f
parentfa4362982c4e5d07c158c470f957f6ffd2fc7cc9
parent519c1f64330bcdb06962be38b943579002b66b15
Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"