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