tree 1c320f590feff738015cad21eb7e5c8a6659f8e5
parent 817f3f973b281bb7ed0e2ed15c279273e5626dd8
parent 7933b3bc61428e9751ec6ed6a993433a4257c987
author Jack He <siyuanh@google.com> 1485502790 +0000
committer android-build-merger <android-build-merger@google.com> 1485502790 +0000

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

Change-Id: I9fdd6871e65b83f19e0a3be0596b08e5e27794d4