OSDN Git Service
Peter Ng [Tue, 18 Oct 2011 00:26:10 +0000 (17:26 -0700)]
am
f129988a: Merge "Bullet points updated and permission colors are not orange" into ics-mr0
* commit '
f129988a1aa8a210dc125b0f427d848a2aeb8bb2':
Bullet points updated and permission colors are not orange
Peter Ng [Tue, 18 Oct 2011 00:24:32 +0000 (17:24 -0700)]
Merge "Bullet points updated and permission colors are not orange" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:15 +0000 (17:23 -0700)]
am
e95a1190: Merge "Update unlock halo asset" into ics-mr0
* commit '
e95a1190ff9e15ac0924cd7f294cf6a486e3119f':
Update unlock halo asset
Justin Ho [Tue, 18 Oct 2011 00:23:14 +0000 (17:23 -0700)]
am
0f86772a: Merge "Update text select handles" into ics-mr0
* commit '
0f86772ad7837a1b084bba7f8180f267e958a9b2':
Update text select handles
Justin Ho [Tue, 18 Oct 2011 00:23:12 +0000 (17:23 -0700)]
am
c598fcf4: Merge "Update stat_sys icons with different resize method" into ics-mr0
* commit '
c598fcf4d24357628c56888440b39a130a36824a':
Update stat_sys icons with different resize method
Justin Ho [Tue, 18 Oct 2011 00:23:10 +0000 (17:23 -0700)]
am
49317b77: Merge "Update spinner assets" into ics-mr0
* commit '
49317b77fddd03ed8a5bed520aefc248edfb9e14':
Update spinner assets
Justin Ho [Tue, 18 Oct 2011 00:23:09 +0000 (17:23 -0700)]
am
0c7020dd: Merge "Update scrubber assets" into ics-mr0
* commit '
0c7020dd524a8354ea11ffa2228ac6a930e5114b':
Update scrubber assets
Justin Ho [Tue, 18 Oct 2011 00:23:06 +0000 (17:23 -0700)]
am
d864a503: Merge "Update rating stars" into ics-mr0
* commit '
d864a503c0ea201c12266ca2dc4da1ccc2d66e0b':
Update rating stars
Justin Ho [Tue, 18 Oct 2011 00:23:05 +0000 (17:23 -0700)]
am
488eddca: Merge "Update lockscreen assets" into ics-mr0
* commit '
488eddca0f1b2fd824de52e0f38c90b2d129d3b0':
Update lockscreen assets
Justin Ho [Tue, 18 Oct 2011 00:23:04 +0000 (17:23 -0700)]
am
e93f09d6: Merge "Update lockscreen assets" into ics-mr0
* commit '
e93f09d66853f568eb253b458bd2cad2a34cb79a':
Update lockscreen assets
Justin Ho [Tue, 18 Oct 2011 00:23:02 +0000 (17:23 -0700)]
am
2076de1b: Merge "Update fastscroll assets" into ics-mr0
* commit '
2076de1b43bfff65635bd314bbaae0400afd091c':
Update fastscroll assets
Justin Ho [Tue, 18 Oct 2011 00:23:01 +0000 (17:23 -0700)]
am
8ffa1371: Merge "Update checkboxes" into ics-mr0
* commit '
8ffa1371616eb8096e8063bdff3fef75f74efbc5':
Update checkboxes
Justin Ho [Tue, 18 Oct 2011 00:21:47 +0000 (17:21 -0700)]
Merge "Update unlock halo asset" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:30 +0000 (17:21 -0700)]
Merge "Update text select handles" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:22 +0000 (17:21 -0700)]
Merge "Update stat_sys icons with different resize method" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:15 +0000 (17:21 -0700)]
Merge "Update spinner assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:06 +0000 (17:21 -0700)]
Merge "Update scrubber assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:57 +0000 (17:20 -0700)]
Merge "Update rating stars" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:49 +0000 (17:20 -0700)]
Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:40 +0000 (17:20 -0700)]
Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:32 +0000 (17:20 -0700)]
Merge "Update fastscroll assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:22 +0000 (17:20 -0700)]
Merge "Update checkboxes" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:19:31 +0000 (17:19 -0700)]
am
68bb87b9: Merge "Update stars" into ics-mr0
* commit '
68bb87b9f927555add2eb061510e54f477abcb29':
Update stars
Justin Ho [Tue, 18 Oct 2011 00:17:31 +0000 (17:17 -0700)]
Merge "Update stars" into ics-mr0
Romain Guy [Tue, 18 Oct 2011 00:11:08 +0000 (17:11 -0700)]
Merge "Return early when we cannot allocate a hardware layer Bug #
5462308"
Justin Ho [Mon, 17 Oct 2011 23:00:04 +0000 (16:00 -0700)]
am
3877089c: Merge "Update Settings Storage app icon" into ics-mr0
* commit '
3877089c8e40402bf3e0c236e8d7add6ce73fb11':
Update Settings Storage app icon
Justin Ho [Mon, 17 Oct 2011 22:57:39 +0000 (15:57 -0700)]
Merge "Update Settings Storage app icon" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 22:54:25 +0000 (15:54 -0700)]
am
5f94580c: Merge "Update default app icon" into ics-mr0
* commit '
5f94580c93031c515fffb80a350430cd7bde434d':
Update default app icon
Robert Ly [Mon, 17 Oct 2011 22:54:24 +0000 (15:54 -0700)]
am
ffaab837: Merge "docs: adt and tools filesizes and md5sums" into ics-mr0
* commit '
ffaab837e7686fa81ab20e1fed32d33c684a295e':
docs: adt and tools filesizes and md5sums
Justin Ho [Mon, 17 Oct 2011 22:53:00 +0000 (15:53 -0700)]
Merge "Update default app icon" into ics-mr0
Robert Ly [Mon, 17 Oct 2011 22:52:51 +0000 (15:52 -0700)]
Merge "docs: adt and tools filesizes and md5sums" into ics-mr0
Mathias Agopian [Mon, 17 Oct 2011 22:52:31 +0000 (15:52 -0700)]
am
9a0732af: Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0
* commit '
9a0732af1bd96a7d8247dee124a7da389137a52f':
SensorManager reconnects to sensor service when the later dies
Mathias Agopian [Mon, 17 Oct 2011 22:50:36 +0000 (15:50 -0700)]
Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0
Jeff Sharkey [Mon, 17 Oct 2011 22:31:10 +0000 (15:31 -0700)]
am
31603aac: Merge "Validate commands and arguments." into ics-mr0
* commit '
31603aacbb54b98cbee498412f6a5eb9dd4a2788':
Validate commands and arguments.
Jeff Sharkey [Mon, 17 Oct 2011 22:29:25 +0000 (15:29 -0700)]
Merge "Validate commands and arguments." into ics-mr0
Dianne Hackborn [Mon, 17 Oct 2011 22:28:07 +0000 (15:28 -0700)]
am
5d199737: Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0
* commit '
5d199737cb22733b065453ee95dfd9c9e5e87d5b':
Fix stupid bug breaking touch on devices without a nav bar.
Dianne Hackborn [Mon, 17 Oct 2011 22:26:18 +0000 (15:26 -0700)]
Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0
Robert Ly [Mon, 17 Oct 2011 22:23:18 +0000 (15:23 -0700)]
Merge "docs: nfc updates"
Claudia de Veaux [Mon, 17 Oct 2011 21:05:36 +0000 (14:05 -0700)]
Merge "String edits to bring to standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328"
Jamie Gennis [Mon, 17 Oct 2011 19:40:49 +0000 (12:40 -0700)]
am
c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0
* commit '
c4de6f81d4533acbfc162d051de480d474b72e76':
MediaPlayer: properly handle released surfaces
Jamie Gennis [Mon, 17 Oct 2011 19:38:36 +0000 (12:38 -0700)]
Merge "MediaPlayer: properly handle released surfaces" into ics-mr0
The Android Open Source Project [Mon, 17 Oct 2011 19:20:06 +0000 (12:20 -0700)]
Reconcile with ics-mr0-release
Change-Id: Id91d1990671b3bb8778b0bac178a36e63f7c7b8a
Peter Ng [Mon, 17 Oct 2011 18:58:54 +0000 (11:58 -0700)]
am
63fae9d5: Merge "Layout changes to recents" into ics-mr0
* commit '
63fae9d56286e7c51261a5a00755466b350efa33':
Layout changes to recents
Peter Ng [Mon, 17 Oct 2011 18:57:38 +0000 (11:57 -0700)]
Merge "Layout changes to recents" into ics-mr0
Scott Main [Mon, 17 Oct 2011 18:35:54 +0000 (11:35 -0700)]
am
ca3c8a97: Merge "docs: revisions to api overview" into ics-mr0
* commit '
ca3c8a9703ccde66570f0130bb3a8863dd53e4b6':
docs: revisions to api overview
Jamie Gennis [Mon, 17 Oct 2011 18:35:53 +0000 (11:35 -0700)]
am
3a735078: Merge "SurfaceTexture: report binder transaction failures" into ics-mr0
* commit '
3a73507801b56da83140fad14a1a3d4eced213d9':
SurfaceTexture: report binder transaction failures
Dianne Hackborn [Mon, 17 Oct 2011 18:32:51 +0000 (11:32 -0700)]
am
c047f60d: Merge "Fix issue #
5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0
* commit '
c047f60db277252f8921b88c82df1a8812afb169':
Fix issue #
5445666: bunch of com.android.server.TextServicesManagerService crashes
Daniel Sandler [Mon, 17 Oct 2011 18:32:47 +0000 (11:32 -0700)]
am
61e980d6: Merge "Turn off chatty logging." into ics-mr0
* commit '
61e980d6187aa052e92387d7b12b3179a9427db4':
Turn off chatty logging.
Chet Haase [Mon, 17 Oct 2011 18:32:45 +0000 (11:32 -0700)]
am
1aad3b5e: Merge "Issue
5432115: Speed up notification scrolling" into ics-mr0
* commit '
1aad3b5e336a04ed612c091d8002569f959e1722':
Issue
5432115: Speed up notification scrolling
Winson Chung [Mon, 17 Oct 2011 18:32:38 +0000 (11:32 -0700)]
am
49a98c8f: Merge "Showing notifications after taking a screenshot (Bug:
5333706)" into ics-mr0
* commit '
49a98c8f64d16eab3f2de48a04ac2a9e986abb76':
Showing notifications after taking a screenshot (Bug:
5333706)
Amith Yamasani [Mon, 17 Oct 2011 18:32:33 +0000 (11:32 -0700)]
am
541f6cfb: Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0
* commit '
541f6cfba8d1beb240e841530a761a084e354f64':
Add alarm volume to the list of volumes in the volume overlay.
Narayan Kamath [Mon, 17 Oct 2011 18:32:25 +0000 (11:32 -0700)]
am
39268ffc: Format default locale the same way as those stored in prefs.
* commit '
39268ffcb74f4c177e5e7427b66480c77743f928':
Format default locale the same way as those stored in prefs.
Mathias Agopian [Mon, 17 Oct 2011 18:32:19 +0000 (11:32 -0700)]
am
840b8a67: Revert "Add a LayerScreenshot"
* commit '
840b8a678537519c27ddf2f818494eaa20a135d4':
Revert "Add a LayerScreenshot"
Mathias Agopian [Mon, 17 Oct 2011 18:32:16 +0000 (11:32 -0700)]
am
4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0
* commit '
4fb6416e3a21031a88921a784ae62b13d8a1a39f':
we need to guarantee that h/w comp set() is called when a buffer has been retired
Mathias Agopian [Mon, 17 Oct 2011 18:32:15 +0000 (11:32 -0700)]
am
fefffc68: Merge "add logging and defensive code when initializing sensors" into ics-mr0
* commit '
fefffc685ab703b44f6e32b5ec45292b22d370a3':
add logging and defensive code when initializing sensors
Dianne Hackborn [Mon, 17 Oct 2011 18:32:12 +0000 (11:32 -0700)]
am
bd9d2bcd: Whoops, remove left-over debug output.
* commit '
bd9d2bcdebfa66a0f71fa67aa256dcae4ccd93da':
Whoops, remove left-over debug output.
Dianne Hackborn [Mon, 17 Oct 2011 18:32:10 +0000 (11:32 -0700)]
am
cd8640fc: Merge "Fix issue #
5398675: It\'s (too) easy to keep the navigation bar..." into ics-mr0
* commit '
cd8640fc1a801349e863a7b6270a0702a63c014b':
Fix issue #
5398675: It's (too) easy to keep the navigation bar...
Jim Miller [Mon, 17 Oct 2011 18:32:08 +0000 (11:32 -0700)]
am
7b5dd873: Fix
5466793: Fix memory leak in system process when face lock is enabled.
* commit '
7b5dd87351ac476dd872c51f9b819d2a3e572382':
Fix
5466793: Fix memory leak in system process when face lock is enabled.
Elliott Hughes [Mon, 17 Oct 2011 18:32:08 +0000 (11:32 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Jamie Gennis [Mon, 17 Oct 2011 18:31:39 +0000 (11:31 -0700)]
Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61
* changes:
SurfaceFlinger: Remove display freezing code
SurfaceFlinger: add some layer update tests
SurfaceFlinger: make sync transactions explicit
Dianne Hackborn [Mon, 17 Oct 2011 18:31:35 +0000 (11:31 -0700)]
am
e6b68036: New aapt feature to do smarter filtering of configurations.
* commit '
e6b680364dd992907a8d2037685a2e500d188dfb':
New aapt feature to do smarter filtering of configurations.
Uriel Rodriguez [Mon, 17 Oct 2011 18:31:19 +0000 (11:31 -0700)]
am
d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0
* commit '
d814d4fa0c76a0384f7e32816e1ca36f237911c6':
going directly to backup after face unlock fails 15 times
Scott Main [Mon, 17 Oct 2011 18:30:58 +0000 (11:30 -0700)]
am
f755a2e8: Merge "docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)" into ics-mr0
* commit '
f755a2e8aabfd6b26df4f3f56f0e9cdfb06cc173':
docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)
Bart Sears [Mon, 17 Oct 2011 18:30:52 +0000 (11:30 -0700)]
am
b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0
* commit '
b227cce31641c39a1a586739561b4776019945a4':
Check MediaPlayer state, do not teardown() from UI thread.
Mathias Agopian [Mon, 17 Oct 2011 18:30:33 +0000 (11:30 -0700)]
am
57337eb7: Merge "Add a LayerScreenshot" into ics-mr0
* commit '
57337eb78e65c160fb9c46a01e04c476d1bfdca1':
Add a LayerScreenshot
Scott Main [Mon, 17 Oct 2011 18:26:59 +0000 (11:26 -0700)]
Merge "docs: revisions to api overview" into ics-mr0
Jamie Gennis [Mon, 17 Oct 2011 18:25:46 +0000 (11:25 -0700)]
Merge "SurfaceTexture: report binder transaction failures" into ics-mr0
Dianne Hackborn [Mon, 17 Oct 2011 18:16:57 +0000 (11:16 -0700)]
Merge "Fix issue #
5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0
Daniel Sandler [Mon, 17 Oct 2011 17:50:18 +0000 (10:50 -0700)]
Merge "Turn off chatty logging." into ics-mr0
Chet Haase [Mon, 17 Oct 2011 17:50:16 +0000 (10:50 -0700)]
Merge "Issue
5432115: Speed up notification scrolling" into ics-mr0
Winson Chung [Mon, 17 Oct 2011 17:20:46 +0000 (10:20 -0700)]
Merge "Showing notifications after taking a screenshot (Bug:
5333706)" into ics-mr0
Amith Yamasani [Mon, 17 Oct 2011 16:42:52 +0000 (09:42 -0700)]
Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0
Steve Block [Mon, 17 Oct 2011 15:58:58 +0000 (08:58 -0700)]
Merge "Fix use of WebView.loadData() to avoid passing invalid encoding"
Justin Ho [Mon, 17 Oct 2011 14:07:29 +0000 (07:07 -0700)]
am
eaf49524: Merge "Moving text cursor to nodpi" into ics-mr0
* commit '
eaf4952410eb86d6ac8b343af3024250b9550dfd':
Moving text cursor to nodpi
Peter Ng [Mon, 17 Oct 2011 14:07:27 +0000 (07:07 -0700)]
am
a3ffec23: Update stat_ icons
* commit '
a3ffec23178922a48aee2ad10239ae79640b5bcd':
Update stat_ icons
Jim Miller [Mon, 17 Oct 2011 14:07:18 +0000 (07:07 -0700)]
am
ff74b9c8: Merge "Fix
5458658: Fix memory leak in lock screen" into ics-mr0
* commit '
ff74b9c88400a14b1faa43c514aac348674ca685':
Fix
5458658: Fix memory leak in lock screen
Justin Ho [Mon, 17 Oct 2011 14:07:16 +0000 (07:07 -0700)]
am
ccf29b4c: Merge "Updating numberpicker assets" into ics-mr0
* commit '
ccf29b4c03422a858a2fcc644e3d2ecbcc555208':
Updating numberpicker assets
Justin Ho [Mon, 17 Oct 2011 14:07:14 +0000 (07:07 -0700)]
am
a6389a9c: Merge "Updated codelock assets" into ics-mr0
* commit '
a6389a9c1e1a50fe040961dfead76102b530b149':
Updated codelock assets
Justin Ho [Mon, 17 Oct 2011 14:07:11 +0000 (07:07 -0700)]
am
af951c17: Merge "Update presence away asset" into ics-mr0
* commit '
af951c17e75b378a382dc4e7fefa7464f7bdfddb':
Update presence away asset
Justin Ho [Mon, 17 Oct 2011 14:07:10 +0000 (07:07 -0700)]
am
52670cd4: Merge "Update list selector background (disabled state)" into ics-mr0
* commit '
52670cd4f73aa28a72dc1df4e7fa92fb0d972781':
Update list selector background (disabled state)
Justin Ho [Mon, 17 Oct 2011 14:07:08 +0000 (07:07 -0700)]
am
3c2bbc24: Merge "Update share pack assets" into ics-mr0
* commit '
3c2bbc2406e491b11e16b9f8bb0495d433097d52':
Update share pack assets
Scott Main [Mon, 17 Oct 2011 14:07:05 +0000 (07:07 -0700)]
am
8009752d: Merge "fix android beam demo path" into ics-mr0
* commit '
8009752da64f5c6ec4df4f1737032bba74ebb2a4':
fix android beam demo path
Justin Ho [Mon, 17 Oct 2011 14:07:04 +0000 (07:07 -0700)]
am
686420a4: Merge "Update rating star buttons" into ics-mr0
* commit '
686420a40e2bfd7c701cba9748d4771315dcd1cc':
Update rating star buttons
Justin Ho [Mon, 17 Oct 2011 14:07:02 +0000 (07:07 -0700)]
am
cd8f69dd: Merge "Update unlock halo asset" into ics-mr0
* commit '
cd8f69dd84306267db23426c538f86b577d82511':
Update unlock halo asset
Justin Ho [Mon, 17 Oct 2011 14:07:00 +0000 (07:07 -0700)]
am
269c64de: Merge "Update lockscreen assets" into ics-mr0
* commit '
269c64de8817e158e9ae49ea489344fbfc46f160':
Update lockscreen assets
Justin Ho [Mon, 17 Oct 2011 14:06:57 +0000 (07:06 -0700)]
am
41c5a607: Merge "Update bullet permission asset" into ics-mr0
* commit '
41c5a607498b8922105ba9dfeb6adf8dd0a82050':
Update bullet permission asset
The Android Automerger [Mon, 17 Oct 2011 13:27:58 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Steve Block [Mon, 17 Oct 2011 09:30:41 +0000 (02:30 -0700)]
Merge "Improve documentation for WebChromeClient.onCreateWindow()"
Steve Block [Mon, 17 Oct 2011 09:30:00 +0000 (02:30 -0700)]
Merge "Clean up documentation for WebView.loadUrl()"
Mathias Agopian [Mon, 17 Oct 2011 06:54:25 +0000 (23:54 -0700)]
Revert "Add a LayerScreenshot"
This reverts commit
d6809f40cf61203573ec5dbc437f695cd132cc18.
Mathias Agopian [Mon, 17 Oct 2011 05:15:23 +0000 (22:15 -0700)]
SensorManager reconnects to sensor service when the later dies
if system process ever restarted, processes using a SensorManager
would loose the ability to use it, resulting to a crash.
we now listen for sensor service death and reconnected if necessary.
Bug:
5445240
Change-Id: Ia47f8b26cdcecb729fa22bf11d55e10fcaef8cfc
Mathias Agopian [Mon, 17 Oct 2011 04:08:00 +0000 (21:08 -0700)]
Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0
Mathias Agopian [Mon, 17 Oct 2011 04:07:42 +0000 (21:07 -0700)]
Merge "add logging and defensive code when initializing sensors" into ics-mr0
Mathias Agopian [Mon, 17 Oct 2011 01:46:35 +0000 (18:46 -0700)]
we need to guarantee that h/w comp set() is called when a buffer has been retired
removed a test that could violate this guarantee. note that we
have no proof tha this ever happened, but consequences could be
hard lock-ups.
the code here was intended to track the region to update for displays
that can do partial update. the logic discarded the update entirely
if that region was empty. instead we just redraw the whole thing
(note that we should never be there with an empty region and retired
buffers though).
Bug:
5466259
Change-Id: I91ccab3b1a599e729e438eb833939e2236da6854
The Android Automerger [Sun, 16 Oct 2011 23:52:18 +0000 (16:52 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Sun, 16 Oct 2011 21:15:21 +0000 (14:15 -0700)]
Merge "Fix issue #
5398675: It's (too) easy to keep the navigation bar..." into ics-mr0
Alex Sakhartchouk [Sun, 16 Oct 2011 19:13:18 +0000 (12:13 -0700)]
Merge "Adding getter functions for script side RS objects. Multiproject change involving on device linker"
The Android Automerger [Sun, 16 Oct 2011 13:28:20 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Mathias Agopian [Sun, 16 Oct 2011 07:38:30 +0000 (00:38 -0700)]
add logging and defensive code when initializing sensors
Bug:
5445240
Change-Id: I9dc7d27d3e8b4f15989488859831526d8c7ded3b
Uriel Rodriguez [Sat, 15 Oct 2011 15:44:21 +0000 (08:44 -0700)]
Merge "going directly to backup after face unlock fails 15 times" into ics-mr0