commit | 6efd692ffd10236369509818006f73e7ae2579ce | [log] [tgz] |
---|---|---|
author | Maurice Lam <yukl@google.com> | Mon Dec 15 22:03:39 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 22:03:39 2014 +0000 |
tree | 80184bee385987c214a810df3da9a233ac5366fd | |
parent | 13df2564af41ecfcd3a7c7707ca8106811b2d7a2 [diff] | |
parent | befc1267a59b4b412b86babedaa4f6727fa239a0 [diff] |
am befc1267: am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev * commit 'befc1267a59b4b412b86babedaa4f6727fa239a0': [FRP] Open the lock setup screens in same task