tree 6332c857fc1e55d5784e94303c995d1a48f26918
parent 0c70cdacb84865cbf02054e66d24af6d5dda1d3e
author The Android Automerger <android-build@google.com> 1455028597 -0800
committer The Android Automerger <android-build@google.com> 1455028597 -0800

"updated manifest from emu-master-dev@c5ea1560"