tree 183a5144ad1dd2ed5766c74e00634256f03ac495
parent a1b32c47f5044b510d2c77360f13a9e2c5d53137
parent 6eb093909c5711f2482952e3d85dab66bad234c3
author Jeff Sharkey <jsharkey@android.com> 1416245333 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416245334 +0000

Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev

* changes:
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.