| commit | 6268f7c75274e07148b0ac3f5693244639d24e5f | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Fri Sep 01 00:22:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 01 00:22:52 2017 +0000 |
| tree | 0b5a10e4111f500a144fd4a174ea4ef297f870ee | |
| parent | 76e2b22796eebda33b3bbd2aff57229a685e24c4 [diff] | |
| parent | 8c5471250e4a1f709e904a0f1f14306786b81ba8 [diff] |
Merge changes from topic "aosp-emulator-oc" am: 35149ca0b7 -s ours am: 8c5471250e Change-Id: Ia7ed839c80df01d7c5c22e56a88c34e9a3789222