tree b279e71af3ccdd91588d11de0c7a38ffb9649151
parent fe1626cab23e3d28d0f8c503d4a2f4b4d4101487
parent af71dc98b30a9570608b8bee97c9c76065c28d88
author Jack He <siyuanh@google.com> 1485503583 +0000
committer android-build-merger <android-build-merger@google.com> 1485503583 +0000

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

Change-Id: I9c6c6bd0d310d51a359be665c968169f9aceb7fc