tree b8db9631c89d50b9afb220ecb3e7869405ed4714
parent 19509c838e3e9a34df29163f17ef3a7ea6375b14
parent 1d656e8aa21bbc463d717fde4709f2f3f4f004a9
author Tenghui Zhu <ztenghui@google.com> 1455063220 +0000
committer android-build-merger <android-build-merger@google.com> 1455063220 +0000

Merge "Fix one compiler error found by mmm" into mnc-ub-dev am: 528aa049fc
am: 1d656e8aa2

* commit '1d656e8aa21bbc463d717fde4709f2f3f4f004a9':
  Fix one compiler error found by mmm