tree 3f44731d93f9d3831bf08c61db325e329e27e9ce
parent b2322f1e2f37b94362c08471f24b15fcdb715a45
parent a61a79ba201de9faf8ead2271c7ebcf4a852f47c
author Yabin Cui <yabinc@google.com> 1459366151 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459366151 +0000

Merge "base: Avoid compilation error when compiled with -Wdangling-else." into nyc-dev