merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca
authorPyry Haulos <phaulos@google.com>
Fri, 16 Dec 2016 22:28:05 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 22:28:05 +0000 (22:28 +0000)
commit5c1cc6ba4636f9410ae354a8f6412df48b46de5c
tree3d9015f2505ad7e7198c752af0bab9e6ff0e2229
parent1094f351d107c28d045b2278404edfff4f487f38
parentaea1bbfaa2ebf995d85fd1e066b0689ca642c8d0
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca
am: aea1bbfaa2

Change-Id: I82c416fb663418dd6bd062fa1b5375ec7c99fa5a