Merge "Add sanity checking of API version" into nyc-dev
authorDavid Sodman <dsodman@google.com>
Tue, 5 Apr 2016 20:56:39 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Apr 2016 20:56:39 +0000 (20:56 +0000)
am: ff697ef

* commit 'ff697ef37589f0daa4f8fa7a2bbe839f34851636':
  Add sanity checking of API version

Change-Id: I97ce9db5fb5c45f1d1359c4d6de09a60472a5146


Trivial merge