| commit | 9c917b107e69dc854c166e246bf650c486e6510c | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Tue Dec 06 02:35:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 06 02:35:55 2016 +0000 |
| tree | fb61866e22a5f25e113c86acbf7bcb7c3d1cb72c | |
| parent | b176ee9a9f7670e8ce38b26577d685e2d17f19ce [diff] | |
| parent | ea593377b625313ff9005e53214ca2f58a90b0c0 [diff] |
Merge "Fix windows and mac build" am: 9276d7e941 am: 8ff0729e59 am: ea593377b6 Change-Id: Iea939c9ba91bbe34557563c79c270b849040acdb