tree 87f0dbf0a3417318cbb7f8fb1ec15d18ed8a6537
parent 1aceeb82202e6fb63595624bc9da84edb4433ac3
parent 128e6001ead4254ddb479bb46731341094ad5b5e
author Logan Chien <loganchien@google.com> 1519960564 +0000
committer android-build-merger <android-build-merger@google.com> 1519960564 +0000

Merge "Reformat Android.bp file" am: a5510434d6 am: 343b9da05f
am: 128e6001ea

Change-Id: I26f81994a21b46dfa7877d7a2428ff8972193b32