| commit | b2967dd178f0de2d1b79472ddc37c7550f86bf1d | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@android.com> | Fri Sep 19 06:17:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 06:17:05 2014 +0000 |
| tree | 4694666b52007233da46a331156d911f3f5a153d | |
| parent | f1ce3f4f821bd9292d329040d5b7fdc3e33b356c [diff] | |
| parent | ebae1bfeaa11a9fd3a3406ff277b70435c7850bd [diff] |
am ebae1bfe: am 46679c1d: am 8d35442b: Merge "fix windows build" * commit 'ebae1bfeaa11a9fd3a3406ff277b70435c7850bd':