Skip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev.
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:14:42 +0000 (00:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:14:42 +0000 (00:14 +0000)
am: c5bbebc46a  -s ours

Change-Id: I9bfe818beb07950ca63f6f1d2e4efbfaaf7eee8d


Trivial merge