tree 00f60f42752f6936b4dff3230c43c81f7dafd3ab
parent 2e12e3aab977dbdaeea90159ce560a3067a28d48
parent f58555baf05c6c53302e80b6453b01750b2ee8cd
author Yigit Boyar <yboyar@google.com> 1508363659 +0000
committer android-build-merger <android-build-merger@google.com> 1508363659 +0000

Merge "Flatfoot rc1 <3" into oc-mr1-support-27.0-dev
am: f58555baf0

Change-Id: If619e734e332432480a4316a837fba4d2d20cb76