| commit | 22221a4f5ab3ab2bc64febbf4595f4ec9282c92f | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Mon Aug 14 18:49:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 14 18:49:42 2017 +0000 |
| tree | b01e575bd02c422b79d1157c8da574144b8f4bc6 | |
| parent | 55e9891688c88b6233fa576cf2416c0e310a26c5 [diff] | |
| parent | 60df0a831cdc3db38c4b3e9cca6810f8cbd9c62c [diff] |
Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev am: 60df0a831c Change-Id: I6b3976e5f96324ffa9474cd84ff94f278a9dde33