tree b86875b5dcdc93d0507614e92d8e0748d1a8b56a
parent 984b786b0e60625384d2e0ff01a6198683d05053
parent 92052aa5827f29bfbaa5837b23cb44b641f14035
author Keun-young Park <keunyoung@google.com> 1503008230 +0000
committer android-build-merger <android-build-merger@google.com> 1503008230 +0000

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

Change-Id: I7cd336807b1084bb52fcc2d973b2fd8efe5f54c7