Commit 5bb64976 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 7a9749ec: am 8a015722: resolved conflicts for merge of 4706606c to jb-mr2-dev 

* commit '7a9749ec':
  Regenerate NOTICE files.
parents 30be06bc 7a9749ec
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