Merge "Fix test copying zero sized regions" into nyc-dev am: 1d141cf052
authorMika Isojarvi <misojarvi@google.com>
Tue, 17 May 2016 18:44:54 +0000 (18:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 May 2016 18:44:54 +0000 (18:44 +0000)
am: 0354f299a8

* commit '0354f299a8324274d617d8a1d9e65fba1303e1fb':

Change-Id: I65bc5cbfb438722d8dc271ef15091dca8e2d9642


Trivial merge