| commit | ebae1bfeaa11a9fd3a3406ff277b70435c7850bd | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@android.com> | Tue Sep 16 18:20:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:20:08 2014 +0000 |
| tree | 477c9f45d3278c04f3fe8bba235979c6b1938452 | |
| parent | 0a19c517b775ad0e3a66d896dd8a3b01bb476e08 [diff] | |
| parent | 46679c1dce8dff027e1f87acb9bcfc81c0613721 [diff] |
am 46679c1d: am 8d35442b: Merge "fix windows build" * commit '46679c1dce8dff027e1f87acb9bcfc81c0613721': fix windows build