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

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

Change-Id: Id21d50893650cb7e66b6db83e44769cfa739d2ec


Trivial merge