| commit | 4520048535a980203125d830db3bba61222ac324 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Mar 23 23:18:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 23:18:41 2015 +0000 |
| tree | 1f26326dd5df1f0c924110a5b53a7b4fa0dd7b75 | |
| parent | 229f332f45c97590b5de7a2946466983bc86f669 [diff] | |
| parent | 89996c4b74c438bd426710ff52139893aa39514c [diff] |
am 89996c4b: Merge "Undo mac fix to fix windows, fix mac differently." * commit '89996c4b74c438bd426710ff52139893aa39514c': Undo mac fix to fix windows, fix mac differently.