tree 2693af6509e33106cf428ce2d621a6668d037463
parent 20b7d1fa9c92838c53f5697bec8df4002f40bb28
parent 30981fcd28d3b92f3e65c5023dcaaa4c4c8ddaa9
author Alan Viverette <alanv@google.com> 1464208220 +0000
committer android-build-merger <android-build-merger@google.com> 1464208220 +0000

Merge "Revert "Fix build"" into nyc-dev am: 1b5ec362c2 am: d775a70cf0
am: 30981fcd28  -s ours

* commit '30981fcd28d3b92f3e65c5023dcaaa4c4c8ddaa9':
  Revert "Fix build"

Change-Id: I23098eb416aae7774c0ef654a3569d0db57b2a43