tree e730f6111acd7494dce860c76a2c8d41f2053def
parent 539556ac795467dcbe28c58acf06c1d0c42f16d6
parent 8b3b60cbf960bcbc74c19386892b8403760e02bd
author Tao Bao <tbao@google.com> 1481927889 +0000
committer android-build-merger <android-build-merger@google.com> 1481927889 +0000

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 6727a1e718 am: 9ac16f1f48
am: 8b3b60cbf9

Change-Id: I7112a6549544245c00cfea6444fdd2f8437521ff