tree acc20159dc3207b6e6dea633bff64274ae7dbd6f
parent 0a63d341411b8ac84507fa2a09b4a0740be412f3
parent 800f383dbf290dee579a2ea752d26e5ac49d5534
author Andrew Hsieh <andrewhsieh@google.com> 1413422827 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1413422828 +0000

Merge "Move 64-bit headers/libs to android-21"