| commit | a9158416f8e7c9ce63c1740236cd388575c74caa | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Fri Sep 01 00:45:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 01 00:45:46 2017 +0000 |
| tree | 1d4936fcb51a5dabc88f20fada8bcfdab2fc00a1 | |
| parent | 3a3b9836d7c03c743f057aa4f85a81bdb5032c7d [diff] | |
| parent | 8f8ce7025be9303e46b060af1d7ceb7fb6397714 [diff] |
Merge changes from topic "aosp-emulator-oc" am: 35149ca0b7 -s ours am: 8c5471250e am: 6268f7c752 -s ours am: 8f8ce7025b -s ours Change-Id: I799559a7f9962d504c76649559ab936a144bb714