Merge changes from topic "aosp-oc-mr1-emulator"
am: 0bbd8d9e37
-s ours
Change-Id: I4ad3877f1a04afb4a9e44ee121254cfef5cdf78c
This commit is contained in:
commit
e4f4232eb7
am: 0bbd8d9e37
-s ours
Change-Id: I4ad3877f1a04afb4a9e44ee121254cfef5cdf78c