tree 2418dc894c88177ab98eedff4abbd743a56d8cfd
parent 846ba1676798818e29397f66664923e10555f963
parent aecb1e2b5bf5f66fd9f84100d456c44fa2a5334b
author Paul Lawrence <paullawrence@google.com> 1447435510 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447435510 +0000

Merge "Respect breadcrumb to convert to file encryption"