tree 28dd8007fe4fd81af09f21ca38e464c28b676b05
parent 2c98e128c5a5c94969174b2385692ad93a42a293
parent 0995795e1f257eca86266ed656fe57a634bc0694
author Jorge Lucangeli Obes <jorgelo@google.com> 1454625100 +0000
committer android-build-merger <android-build-merger@google.com> 1454625100 +0000

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

* commit '0995795e1f257eca86266ed656fe57a634bc0694':
  Unit tests: Compile only on 'eng' builds.