| commit | 70723fee5d92f98f4449ba1cedaf38b2dbf584aa | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <ralf@android.com> | Tue May 13 15:20:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:20:52 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | ecfa6c486a8ed41e1ca2b1118fa7624eedd2bea6 [diff] | |
| parent | ee5154282a7eb4aaeef2c9f434180ea48106cf42 [diff] |
am ee515428: (-s ours) am e9001a4d: am 891910a3: (-s ours) am bde50dcb: (-s ours) am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."" * commit 'ee5154282a7eb4aaeef2c9f434180ea48106cf42':