| commit | b741221117695238734126f0a643f127ba5cee0e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Nov 22 15:42:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 22 15:42:41 2014 +0000 |
| tree | 49b59fed32e32b294c554546f166762a1c82afb6 | |
| parent | e79cd67cfdd7efce3c9790a45c166395227ef4e8 [diff] | |
| parent | 456661e38cefe1afbf640036f710f0d481b64bf9 [diff] |
am 456661e3: Merge "Fix Mac build." * commit '456661e38cefe1afbf640036f710f0d481b64bf9': Fix Mac build.