Merge changes from topic 'am-3e509cc2c5f147e5b2d84c53284e013e' into nyc-mr2-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 13 Jan 2017 00:23:02 +0000 (00:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 Jan 2017 00:23:02 +0000 (00:23 +0000)
* changes:
  Skip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev. am: c5bbebc46a  -s ours am: c40b13062c am: c58c0d9cc6 am: be02537646
  Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am: 2a9d42a651 am: c3801f447c am: 43afd5fa99 am: d7680c7cc0


Trivial merge