tree 2836b159c1f6b8dcc1962cbb129bd3233858d460
parent 255433fe146bf6591bc1f7bffe34b69ebcc26c7d
parent 37f0ccac958c582b3083a41b66ee9e358c323e3b
author Andrew Hsieh <andrewhsieh@google.com> 1363703791 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1363703791 +0000

Merge "Fix ndk-build warning in windows"