tree 6758cba17558c79bdb56f54c5c9bc353edd41de9
parent a5c4f7689a74935cc02cc7bbd0906c300cfb6843
parent 69f4ec4191166d198355a77e5622aeae6f50cb94
author Alice Lee <awlee@google.com> 1438891267 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438891267 +0000

Merge "Use test app in separate package from assistant." into mnc-dev