tree 95afa1430c582ad1c6b28f92ad89c6e6b73dfa03
parent 9eda23256ed1c76a1eaae176ecc8c941825c5fb2
parent 5909b07cc473ad965ac5fb8457d4c7b512e07b92
author bohu <bohu@google.com> 1512073209 +0000
committer android-build-merger <android-build-merger@google.com> 1512073209 +0000

Merge "emulator: support system-as-root" am: 44e363f1e3 am: 253dfc22a6
am: 5909b07cc4  -s ours

Change-Id: Ie2c45d04d7d179f754b4a9ca92b64081d68636dc