tree 54cd713fee338e61dbef3dcb6c2fa949179be850
parent 00506c1b96f3dd8d0e225f665fd1dc4e24c2be4c
parent 6d9b2b347d507cebc2972815075e659b39db6e9c
author Bo Hu <bohu@google.com> 1488478350 +0000
committer android-build-merger <android-build-merger@google.com> 1488478350 +0000

Merge "DO NOT MERGE ANYWHERE Emulator: adjust reference-ril to the refactored qemu_pipe" am: 0e4680d46f  -s ours
am: 6d9b2b347d  -s ours

Change-Id: If326f1c733c98624cee325b96040d096781877c6