tree bac7261f0e51a4ad688200bd0484ee0ea0b54e90
parent 9be3769c59aa45a5d04dd9fa23a412f113181fdb
parent 0c967500a9bc35c3b39133bf3ceba59bfbad6f5a
author Makoto Onuki <omakoto@google.com> 1455128066 +0000
committer android-build-merger <android-build-merger@google.com> 1455128066 +0000

Merge "Fix CP2 unit tests" into nyc-dev am: 69a3ec5c23
am: 0c967500a9

* commit '0c967500a9bc35c3b39133bf3ceba59bfbad6f5a':
  Fix CP2 unit tests