tree 6d50271dbcccd243008cf0015a3d3a5a7f176822
parent 711c7becb01eec79d8335f335fab6e00a9164b00
parent 0370a03b6e74e40d5110b83fed2243bf072aee73
author Nick Kralevich <nnk@google.com> 1445573998 +0000
committer android-build-merger <android-build-merger@google.com> 1445573998 +0000

resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e
am: 0370a03b6e

* commit '0370a03b6e74e40d5110b83fed2243bf072aee73':
  DO NOT MERGE: fix build breakage