tree bb4c288df25dbd75bbcbddc4b63f0fc9401a582f
parent 4460d0e554a6694d47e9b3c8cd4ea61c17c135b8
parent 1b6d8237f21225855cb91b9ae869c59563a8293b
author Keun-young Park <keunyoung@google.com> 1503008500 +0000
committer android-build-merger <android-build-merger@google.com> 1503008500 +0000

Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6 am: 92052aa582
am: 1b6d8237f2

Change-Id: I71b1ec275e2850c1a8273ac5eebc7373a0729552