| commit | f098148d8eeec6368d2afd73a5667740d6ebe4fd | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Mar 24 03:25:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 24 03:25:19 2015 +0000 |
| tree | 88d8bd56a0712f19e4098b02b05421f7b37146a4 | |
| parent | f9429983c80fa4d5c0ff4518cf82fbd97127d5cd [diff] | |
| parent | b4c5b8f8ede4ea5b1886c5457daa5d45a250e2a6 [diff] |
am b4c5b8f8: am 45200485: am 89996c4b: Merge "Undo mac fix to fix windows, fix mac differently." * commit 'b4c5b8f8ede4ea5b1886c5457daa5d45a250e2a6': Undo mac fix to fix windows, fix mac differently.