| commit | 8f8ce7025be9303e46b060af1d7ceb7fb6397714 | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Fri Sep 01 00:31:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 01 00:31:06 2017 +0000 |
| tree | 3b7b2f3099e8aad1db14e8ee1464bf64ade420f8 | |
| parent | 47c84825c1578df435c399fd763c350fad2dd0d0 [diff] | |
| parent | 6268f7c75274e07148b0ac3f5693244639d24e5f [diff] |
Merge changes from topic "aosp-emulator-oc" am: 35149ca0b7 -s ours am: 8c5471250e am: 6268f7c752 -s ours Change-Id: I293842cefc5fb0b53466ccb9867c4243acd54bac