| commit | 8c5471250e4a1f709e904a0f1f14306786b81ba8 | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Fri Sep 01 00:17:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 01 00:17:54 2017 +0000 |
| tree | 0b5a10e4111f500a144fd4a174ea4ef297f870ee | |
| parent | 77492a72a22faf2f111bb00699c7e4c30ce4bcd9 [diff] | |
| parent | 35149ca0b786bb036399ab5f0a145d21c4c527ca [diff] |
Merge changes from topic "aosp-emulator-oc" am: 35149ca0b7 -s ours Change-Id: I3fd071590dcb08000b6b6a9666280c35fe6389c8