commit | dcf1f62594127a3182e3703da87f6b0c3c533af2 | [log] [tgz] |
---|---|---|
author | Ian Rogers <irogers@google.com> | Thu Oct 23 12:54:39 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 12:54:39 2014 +0000 |
tree | cd79650750376ed08a6195e40958b072b664f451 | |
parent | 20121d6a18e5a636b595811945918cad5cf598be [diff] | |
parent | 71c4cea525eb6a84d0763a42d241f50c9c2ac8d2 [diff] |
am 71c4cea5: Merge "Fix Mac build." * commit '71c4cea525eb6a84d0763a42d241f50c9c2ac8d2': Fix Mac build.