malloc some advances

Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
DO NOT MERGE - Fix keyguard pattern lockout bug

(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
KeyChain: add explicit package for getPrivateKey.

Bug: 9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
Merge "KeyChain: add explicit package for getPrivateKey."
Update to AU_LINUX_ANDROID_LNX.LA.3.5.2.1.04.04.02.060.112

Change-Id: I615695cc72ce2c03e73a60f70047d73d07436d9b
Merge "Update to AU_LINUX_ANDROID_LNX.LA.3.5.2.1.04.04.02.060.112"
Merge "DO NOT MERGE - Fix keyguard pattern lockout bug"
Merge "malloc some advances"
Use the correct package name for CHOOSER.

Bug: 13013106
Change-Id: I1f715de18e7108274f5a98234376d48c2d329438
Merge "Use the correct package name for CHOOSER."