tree b58608269c6e0e836150cf6d4814d4f0e30b71cc
parent 41d2c49fcf0538c4d516472f159339ec6af01cee
parent 821bd95bf0abd85d87d9b3aa456f4af3d2756e09
author Roberto Perez <robertoalexis@google.com> 1520399683 +0000
committer android-build-merger <android-build-merger@google.com> 1520399683 +0000

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

Change-Id: Id4a4ea8d15412c836306f99534a9b44eba4ca6e6