| commit | 02ee88da2b803c3b9acd4980fa72f7a30187c247 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <[email protected]> | Thu May 29 10:02:25 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu May 29 10:02:25 2014 +0000 |
| tree | 7687d4b570cf991cb8536adb4dbc1501f5cd4394 | |
| parent | e6510f1c59863fe8d9d3f6d335adea18d7ed47da [diff] | |
| parent | 6b265bd4a12e7518a275dddf41c33279bea8e16b [diff] |
am 6b265bd4: Merge "Revert "Revert "Fix the mac build.""" * commit '6b265bd4a12e7518a275dddf41c33279bea8e16b': Revert "Revert "Fix the mac build.""