tree 451a48e49806c9c87b306de63e9d96b42856fada
parent 97b6ab4862839da56b4df6437b14314f74d328b6
parent 7478d51f7042f6b78741058668060e87ce80a703
author Wink Saville <wink@google.com> 1419017125 +0000
committer android-build-merger <android-build-merger@google.com> 1419017125 +0000

am 7c580cab: am b5f1e878: Fix build breakage.
automerge: 7478d51

* commit '7478d51f7042f6b78741058668060e87ce80a703':
  Fix build breakage.