tree 6c52098f6c4fccac8aa1e6aac5c89035bdd84705
parent fe8966769d37fb33b7fd20e8edee3ad8a251d1ee
parent 5d9e4d5b489463012cdef572aff604bf7b737a9e
author Keun Soo Yim <yim@google.com> 1502504549 +0000
committer android-build-merger <android-build-merger@google.com> 1502504549 +0000

Merge "regenerate Android.bp files"
am: 5d9e4d5b48

Change-Id: I5e24dfd81836f531b9896e73c02501bfad9b1e49