tree f1e675d6e84292fb9829562409c8d9ee0968fe3f
parent 2c87959ff666c3be5b73706efed2f9e6af0db41f
parent 261c18d69b75388958b8fd9364b9df21003909c3
author Xavier Ducrohet <xav@android.com> 1396563644 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1396563644 +0000

Merge "Fix build on OS X Mavericks" into idea133