tree 61e3ada4b434af55f00ededa4783fd22e95a23bf
parent 1f055cb81d40e4c2460c4421a44e1c9251a1313c
parent 1fad9af3c7b16669fc5d31f442fbd85e380001e9
author Andrew Sapperstein <asapperstein@google.com> 1464992557 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464992558 +0000

Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev