summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src
diff options
context:
space:
mode:
authorLuan Nguyen <luann@google.com>2015-01-22 17:57:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 17:57:01 +0000
commit2bffc5e7bf2a86024d715716a6fd44def4b5f81c (patch)
tree4aefd0adc8b80f8dbd2440ee264d4abd97515bc5 /packages/Keyguard/src
parent4185030ad49d4e9b42721355953001cd890ed05a (diff)
parent2700393c029baf9443622440f5ebad5073429075 (diff)
downloadframeworks_base-2bffc5e7bf2a86024d715716a6fd44def4b5f81c.zip
frameworks_base-2bffc5e7bf2a86024d715716a6fd44def4b5f81c.tar.gz
frameworks_base-2bffc5e7bf2a86024d715716a6fd44def4b5f81c.tar.bz2
am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767
* commit '2700393c029baf9443622440f5ebad5073429075': docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
Diffstat (limited to 'packages/Keyguard/src')
0 files changed, 0 insertions, 0 deletions