tree aee1888414fc424a40588309b33470cd983fc5c8
parent f27b53025b2a0ae0d8a41a5e45834d900d37aadd
parent bb26711fddd401d50494b61fcdef2c30e9be9af6
author Xin Li <delphij@google.com> 1484331055 +0000
committer android-build-merger <android-build-merger@google.com> 1484331055 +0000

Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf  -s ours
am: bb26711fdd

Change-Id: Icef427c7bca9c030a987d46b4857710f4f353bd2