tree b92f2a6a664a249caa736538c2d2d16ffebf9b65
parent ef3044c46d342e83c0b21339282f30ac4f1116f0
parent 879edc6ca45a391de97f9935f2197caf3951c05f
author Jack He <siyuanh@google.com> 1485481622 +0000
committer android-build-merger <android-build-merger@google.com> 1485481622 +0000

Merge "Enable clang-format on AOSP Music Player"
am: 879edc6ca4

Change-Id: I0b8b4872a6a33e8f88a3c723edf30e191363a60e