tree e2f6ddc713d73e5ba27e68502528856dfce09d6a
parent 5000f5dd06c2c37eeee19b9cb6ba81d42ce0000b
parent 343b9da05fc1d7321c4ba4df1ea2fde4bac45c1d
author Logan Chien <loganchien@google.com> 1519960254 +0000
committer android-build-merger <android-build-merger@google.com> 1519960254 +0000

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

Change-Id: I87e740d639e4509b67927d8836f1b92653329872