| commit | 92c4b1fae7bd56a49f609b600b87de2d3cb34901 | [log] [tgz] |
|---|---|---|
| author | bohu <bohu@google.com> | Fri Oct 27 06:43:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 27 06:43:40 2017 +0000 |
| tree | 728674f041b557460c0c32981eab02645c0c5058 | |
| parent | 08d7d58b5b0b8f5497320805d06e1136e1ce80e1 [diff] | |
| parent | 38b49ea0c1460ef953fb482943931b9f8d3d55d2 [diff] |
Merge "emulator: merge oc-emu-dev development project" am: cf652ac25b -s ours am: 38b49ea0c1 -s ours Change-Id: I742bf81d4aa2d163c087e32e3b019c7a34842b54