tree f80d61ac7a76d704c92776347a84252c1ec1ebee
parent 046faf722cd0b30a1e207616ca95348641ee8990
parent 1cdaa5588fc5c20b7444a9e1f2896a769aefe429
author Xin Li <delphij@google.com> 1473355405 +0000
committer android-build-merger <android-build-merger@google.com> 1473355405 +0000

Merge "Use %z instead of %l for size_t." am: dc41c87d63 am: 2cc71ed02d
am: 1cdaa5588f

Change-Id: I370e1bd9fd6c2be5466fbe8c3d83fda9b8f40f01