| commit | befc1267a59b4b412b86babedaa4f6727fa239a0 | [log] [tgz] |
|---|---|---|
| author | Maurice Lam <yukl@google.com> | Mon Dec 15 17:56:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 17:56:32 2014 +0000 |
| tree | da05ff4875971cf57c439387b27f2174bafb00a0 | |
| parent | 62d35b65f236e494520d7ca480e502c79f5f4fe3 [diff] | |
| parent | 4e8a7219c866030b5870c9d8e0fa930423761048 [diff] |
am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev * commit '4e8a7219c866030b5870c9d8e0fa930423761048': [FRP] Open the lock setup screens in same task