[automerger skipped] Merge "Fix undefined error in ALOGV_IF." am: 1949fae278
am: 452d6c498f
am: 90905a15dd
-s ours
Change-Id: Ie2f4b1feb6e77b0ab447dd3105ca0c9367ec914e
gugelfrei
commit
be7f1796f6