commit | eceef837e34e6860ad532d15402435606550f3fa | [log] [tgz] |
---|---|---|
author | Brian Colonna <bcolonna@google.com> | Thu Nov 29 12:45:18 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 12:45:18 2012 -0800 |
tree | 1140de10bafbebdace51f9f0fa5b23f7b8b5eb28 | |
parent | aaa453dbbdd9307ddc8fbd32e7f3c1e673e02b83 [diff] | |
parent | ceb87a664fdcfa08f98238bfe41fc3a03603cbf8 [diff] |
am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev * commit 'ceb87a664fdcfa08f98238bfe41fc3a03603cbf8': Ignoring FUL unlock signal if user changed fixes b/7572354