tree 6e2a394bc98d81b5ccb587ea5176fa91f724e4f8
parent f4e30dd27e40335335259fc832b3c3e8446cb326
parent 305ab50d45c2ed11f052da1b32b91f1502c14e7a
author Ian Pedowitz <ijpedowitz@google.com> 1494907615 +0000
committer android-build-merger <android-build-merger@google.com> 1494907615 +0000

Merge "Revert "Revert "O is API 26""" into oc-dev
am: 305ab50d45

Change-Id: I5753afcdaab8680a46d6838a04f12085c1493a7d