tree 287cc26a71f2a901393076ff1928104cb313af9b
parent 9964d83869565cf4dda432129cfe50f6ede19338
parent 7f1ea80d65996ab687ff56a884da915535cdc176
author Nick Kralevich <nnk@google.com> 1445564666 +0000
committer android-build-merger <android-build-merger@google.com> 1445564666 +0000

resolve merge conflicts of 834ac204ce to klp-modular-dev.
am: 7f1ea80d65

* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
  DO NOT MERGE: fix build breakage