| commit | 5ce271a18088ef292b86a998c971c8bdc9c1bbbc | [log] [tgz] |
|---|---|---|
| author | bohu <bohu@google.com> | Fri Oct 27 06:50:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 27 06:50:15 2017 +0000 |
| tree | 01c4b472a70f26de465de25488f614eab9a72435 | |
| parent | 97e10dc66fc9e79659f9dcb92daf8c2b8c548cbf [diff] | |
| parent | 92c4b1fae7bd56a49f609b600b87de2d3cb34901 [diff] |
Merge "emulator: merge oc-emu-dev development project" am: cf652ac25b -s ours am: 38b49ea0c1 -s ours am: 92c4b1fae7 -s ours Change-Id: Id117c9bebac1b3c36d5fd04983d7e64704fe2184