commit b64246ae1b00eacd5323f8a8db7249bd726c4f33
author The Android Open Source Project <initial-contribution@android.com> Tue Nov 06 12:23:39 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 06 12:23:39 2012 -0800
tree 099b324771d7fa60a5f985a7a94df2aff081e83d
parent 831f8cf941fa1d298652fdf95fccb7bc693b4fc4
parent c8e3a27b43407268b2bb76b1d4fceee4fa3b314a

am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'c8e3a27b43407268b2bb76b1d4fceee4fa3b314a':
  init: Set ADDR_COMPAT_LAYOUT before spawning processes.
  Dump 256 bytes per chunk pointed by general-purpose registers.
  Wrap system calls in TEMP_FAILURE_RETRY.
  Bring back ADB_EXTERNAL_STORAGE.
  Revert "Upgrade to dlmalloc 2.8.5."
  bluetooth: bring up with bluedroid stack
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.

logcat/event.logtags

diff --git a/logcat/event.logtags b/logcat/event.logtags
index 6040bd9..09640e1 100644
--- a/logcat/event.logtags
+++ b/logcat/event.logtags
@@ -150,8 +150,5 @@
 80305 bionic_event_resolver_wrong_server (uid|1)
 80310 bionic_event_resolver_wrong_query (uid|1)
 
-# libcore failure logging
-90100 cert_pin_failure (certs|4)
-
 # NOTE - the range 1000000-2000000 is reserved for partners and others who
 # want to define their own log tags without conflicting with the core platform.