tree 9e35264f9d75fe2279a5281cbe3d3a0e36aa8c7c
parent bf92b812dbe1c762ff2381ca4ba14290a5ece8b8
parent 4eb7cea562cd117e598a327ab4d93142589c1ae6
author Todd Kennedy <toddke@google.com> 1487188098 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487188102 +0000

Merge "remove app-ephemeral"