tree 1b11f70e85de6e76f466818a9bae1d3386e8abca
parent 469b9d6a84c515773e137999ece7db34fff5174b
parent 4e57b2c35c8d6485ac6f5be41b9e3f66646f8b7d
author Gopinath Elanchezhian <gelanchezhian@google.com> 1540839396 -0700
committer android-build-merger <android-build-merger@google.com> 1540839396 -0700

[automerger skipped] Merge "Add statsdprotolite in Android.bp" am: f469bd2f68 am: 748b449887
am: 4e57b2c35c  -s ours

Change-Id: Iefbf9cf6027099ca610135190d9f1b45f913c43b