tree 866906a1aedf70e2c09a280c211d260509266374
parent e7834b5677020d5602a330129c598d229dfb35c9
parent 90405d02cdbe16ecea9853991c462125e3da2185
author Mike Reed <reed@google.com> 1521805969 +0000
committer android-build-merger <android-build-merger@google.com> 1521805969 +0000

Merge "detect api version, and start respecting offsets" into pi-dev am: dfdc379144
am: 90405d02cd

Change-Id: Ied06df3460e90779e3015e6ba64406a068df5472