commit | ceb87a664fdcfa08f98238bfe41fc3a03603cbf8 | [log] [tgz] |
---|---|---|
author | Brian Colonna <bcolonna@google.com> | Wed Nov 28 12:48:32 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 12:48:32 2012 -0800 |
tree | 04a7e9b7592460b212287702e8cfbd9f952c54c3 | |
parent | 2c7dac19dd2cab68587cd129b45ad593f7bfdc44 [diff] | |
parent | 6f6facc17812fe529f3de0b75de5f9011d73eacc [diff] |
am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev * commit '6f6facc17812fe529f3de0b75de5f9011d73eacc': Ignoring FUL unlock signal if user changed fixes b/7572354