Skip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on
authorXin Li <delphij@google.com>
Thu, 12 Jan 2017 23:21:25 +0000 (15:21 -0800)
committerXin Li <delphij@google.com>
Thu, 12 Jan 2017 23:22:15 +0000 (15:22 -0800)
nougat-mr1-cts-dev.

BUG: 33090058
Change-Id: Ife934b6694e07b2231070cc5d05865fed78e67c4


Trivial merge