tree f832b156820587f295426f6c9757a430c2c9610f
parent 77e15050c501771bbbe3d986348ddc00581bc84b
parent b5cf187c9179e04cf42fe224e3dd1d7cd88d027c
author Yi Kong <yikong@google.com> 1569027977 -0700
committer android-build-merger <android-build-merger@google.com> 1569027977 -0700

Merge "Ignore format-pedantic compiler warning" am: 52aa495074 am: 8bd9fdaea2
am: b5cf187c91

Change-Id: I44cba662f3306c1f940512204294d2656f80ca0b