tree 1c320f590feff738015cad21eb7e5c8a6659f8e5
parent 416e76c59345d0fa0f244bbc4bc14d339992f2ce
parent 572ed5f17c2948caf04bdd7ba8609e21070b97b2
author Jack He <siyuanh@google.com> 1485502301 +0000
committer android-build-merger <android-build-merger@google.com> 1485502301 +0000

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

Change-Id: Ib1b9fe6ba5569bbff7686b2209571c3c5468284f