tree bd436b56148be7fa47f8f27c179fbfeb913198a1
parent 6002133545b0c33bcc4051074b34c90e8c555eb9
parent d775a70cf023fecdaa7c10ebc4c3dfe76ba7492c
author Alan Viverette <alanv@google.com> 1464206606 +0000
committer android-build-merger <android-build-merger@google.com> 1464206606 +0000

Merge "Revert "Fix build"" into nyc-dev am: 1b5ec362c2
am: d775a70cf0

* commit 'd775a70cf023fecdaa7c10ebc4c3dfe76ba7492c':
  Revert "Fix build"

Change-Id: I92eff4fd2bb071f9cec3852711041f7ef9c1ca42