| commit | 1027a0c72d9a8bf4cb596a29672d52de84cdd3e5 | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Fri Oct 27 16:46:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 27 16:46:31 2017 +0000 |
| tree | 01c4b472a70f26de465de25488f614eab9a72435 | |
| parent | 5ce271a18088ef292b86a998c971c8bdc9c1bbbc [diff] | |
| parent | 73599ec3c7b59ed0f3440ffdb2a00551325f42cf [diff] |
Merge "emulator: merge oc-emu-dev development project" into stage-aosp-master am: faa25392e7 -s ours am: 73599ec3c7 -s ours Change-Id: I5029e720df1e9d044ac6d539f63c38962169e642