tree 9f98793a0526f6f1ffe654b79d69a54d1878da0f
parent 89057119d7b854776ed04baed9de73d093fb4f97
parent 7fbbbcf1ac6946c5ab944c1b739a9468a86e1378
author Jim Kaye <jameskaye@google.com> 1438388056 +0000
committer android-build-merger <android-build-merger@google.com> 1438388056 +0000

Merge "Making the emulator respect user-specified data partition size for API 19+" into studio-1.4-dev automerge: dd6391c
automerge: 7fbbbcf

* commit '7fbbbcf1ac6946c5ab944c1b739a9468a86e1378':
  Making the emulator respect user-specified data partition size for API 19+