tree 1396553f75d9d52dbdfbc576af22364d3d436438
parent 13bf5628108cc7df6472721a8c82847cc47c20bc
parent 471ab644e3a08649e7713a9e62c51bf5d83acbfb
author Jeff Sharkey <jsharkey@android.com> 1491348979 +0000
committer android-build-merger <android-build-merger@google.com> 1491348979 +0000

Merge "Just round up the data partition size." into oc-dev am: edcbf28b7c
am: 471ab644e3

Change-Id: I29c38ac08149324c218f244990a8ab3edb9f070c