tree 3c5ac2a9af38f6ebdbb82aa810bdf34d79a561cf
parent d44a8f59a7518b87a3fe4174c78dfb9727e63f89
parent ef2b5bea6b72331568036788c6fcaadf63f1f178
author Paul Lawrence <paullawrence@google.com> 1417545254 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417545254 +0000

Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev