tree 7d39008c91b18d78f18389a4b389a12416c62769
parent f3cf9b465e4720573f631d0257c2ee4e57991093
parent 42a53e0c2a46ae8ef44849c8bfb023abd00fd1b7
author Jorge Lucangeli Obes <jorgelo@google.com> 1454624983 +0000
committer android-build-merger <android-build-merger@google.com> 1454624983 +0000

Merge "Unit tests: Compile only on \'eng\' builds."
am: 42a53e0c2a

* commit '42a53e0c2a46ae8ef44849c8bfb023abd00fd1b7':
  Unit tests: Compile only on 'eng' builds.