tree 5b2ccc249dd99d1e4ba469c877dd35afce7534cb
parent 64b8f7dbeda2ea921744aae9ddd4b2928684935f
parent 09aa2f9b2c34339878dfd218d1c6e09644a108b0
author Qiwen Zhao <zhao@google.com> 1447950632 +0000
committer android-build-merger <android-build-merger@google.com> 1447950632 +0000

Merge remote-tracking branch \'origin/mnc-dr2-dev\' into mnc-dr2-dev-plus-aosp
am: 09aa2f9b2c

* commit '09aa2f9b2c34339878dfd218d1c6e09644a108b0':
  Fix build break with uninitialized boost_fd.
  Improve cpuset support for surfaceflinger.
  liblog: printable do not escape tabs
  libutils: Add UNEXPECTED_NULL status_t