Commit b02ad5ee authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am d116ad43: resolved conflicts for merge of dae1c7c7 to jb-mr1-dev 

* commit 'd116ad43':
  Assert mean and stdev of update deltas
parents e9bc5ff5 d116ad43
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment