tree 3bb93cb99baaaa8f996fd4d6a95980b7e3d6c64e
parent 4a9b938e9d585d8ca0418785ddc86e626c9cebc6
parent 7ae3cf18cefe5bd1559dfe1b708e5b5ddf717db1
author Mark Salyzyn <salyzyn@google.com> 1425517926 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1425517926 +0000

Merge changes I12d6aa4e,I9e802113,I2b30e0fc,Iaf387b9e

* changes:
  logcat: remove dead label code
  logcat: do not stop on unexpected log ID
  Revert "logd: Add minimum time bucket statistics"
  liblog: Instrument logging of logd write drops