| commit | ea593377b625313ff9005e53214ca2f58a90b0c0 | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Tue Dec 06 02:31:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 06 02:31:57 2016 +0000 |
| tree | fb61866e22a5f25e113c86acbf7bcb7c3d1cb72c | |
| parent | 95460e484225013953088715da909de5e6eca8b6 [diff] | |
| parent | 8ff0729e593a28ea194894443e587d69e050c799 [diff] |
Merge "Fix windows and mac build" am: 9276d7e941 am: 8ff0729e59 Change-Id: I8ca8d09fec36ad405cfa697f222dd53888a38026