Commit 66ce89f9 authored Jun 15, 2016 by Android Build Merger (Role) Committed by Android (Google) Code Review Jun 15, 2016

Merge "Merge \\"Update semantics of on-body Keystore API.\\" into nyc-dev am:...

Merge "Merge \\"Update semantics of on-body Keystore API.\\" into nyc-dev am: c152fc15 am: 6aaa25d7" into nyc-mr1-dev-plus-aosp

There are no changes