merge in nyc-mr1-release history after reset to nyc-mr1-dev
authorPyry Haulos <phaulos@google.com>
Fri, 16 Dec 2016 22:19:07 +0000 (22:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 22:19:07 +0000 (22:19 +0000)
commitaea1bbfaa2ebf995d85fd1e066b0689ca642c8d0
tree3d9015f2505ad7e7198c752af0bab9e6ff0e2229
parent87a4ffcd07340545460761ceb447615d83f9d88e
parent868a8938caa908ce37a3e17d69fa6c51f97320fa
merge in nyc-mr1-release history after reset to nyc-mr1-dev
am: 868a8938ca

Change-Id: I07a0249da8ae52fb82ad6120dec0897f63d5e567