tree feca52a70a0744d0c2035432c0b72c64e24c3e3f
parent e64b309d22ba5b40f5e591890b5291e33b2805ff
parent fbde08eb073b690467aadb722da47bc287649dc4
author TreeHugger Robot <treehugger-gerrit@google.com> 1528940948 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528940948 +0000

Merge "emulator: base sdk_phone_armv7/64 on aosp" into pi-dev