| commit | 1f26bf6bfd683b840f688b41d285fd9c942e6ed5 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Nov 21 23:07:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 23:07:03 2014 +0000 |
| tree | 2eb189840ff6c00a3023bb225f813b887cd5d096 | |
| parent | 90102e10093f7bb658fb7dd6c30a1efd5380c6d1 [diff] | |
| parent | 108bdbc934d1e5fb77406d0267ab67f8736dfc57 [diff] |
am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev * commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57': Different messages when wiping user and not device