tree 6343ce70831de27de0c2f9e39841db96f10abb94
parent 8403cf361d65bac75f2a061759361005c3f69ef3
parent fbd0c64c3eb021b772c4741bcb6d85a28dcf0a73
author Roberto Perez <robertoalexis@google.com> 1520400290 +0000
committer android-build-merger <android-build-merger@google.com> 1520400290 +0000

Merge "Removing wrong file" into oc-mr1-jetpack-dev am: 821bd95bf0 am: e419cefbd7
am: fbd0c64c3e

Change-Id: I01bbcad1fa85a7492cf56b630b09e4392eb4bd2f