Merge changes Iefbea3b1,Ieb924b6d
am: a4b53aa26c

* commit 'a4b53aa26c652676c6439cccf020b8b8587509b3':
  liblog: add android_log_timestamp() private function
  liblog: logcat: add epoch and monotonic format modifiers
tree: 76b27397494fd6adaa7d40685fd7bfd386cc7f71
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/