| commit | 3e5e615f75ec08b9c6522e552ea98c0615146924 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@android.com> | Tue Sep 16 19:53:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 19:53:07 2014 +0000 |
| tree | 477c9f45d3278c04f3fe8bba235979c6b1938452 | |
| parent | 2173582b5ab0bdda79c2f4ba784fe2fe12eaa7eb [diff] | |
| parent | 46679c1dce8dff027e1f87acb9bcfc81c0613721 [diff] |
am 46679c1d: am 8d35442b: Merge "fix windows build" * commit '46679c1dce8dff027e1f87acb9bcfc81c0613721': fix windows build