| commit | 38b49ea0c1460ef953fb482943931b9f8d3d55d2 | [log] [tgz] |
|---|---|---|
| author | bohu <bohu@google.com> | Fri Oct 27 06:34:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 27 06:34:31 2017 +0000 |
| tree | 4a87cc08a9c2295a7f94934d2e64d5072b1400a8 | |
| parent | 6f3ae7994ae4726092617bb28975fe528591b35c [diff] | |
| parent | cf652ac25b9eddc7f00668f110a07b509e60dd50 [diff] |
Merge "emulator: merge oc-emu-dev development project" am: cf652ac25b -s ours Change-Id: I48d1219b18ed7ed10bacdd6f68eaef81f1c066f9