tree 6ad2b1b08ff1307ae60813e24d198c0e56642e2d
parent a40737964acd6770f0d740332bb734033afbc1ec
parent 393520d70af736f0cb69d99c0e02c41c1b732961
author Android Build Merger (Role) <android-build-merger@google.com> 1481928357 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481928357 +0000

Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 96c347a9b9 am: 627cc3afb3 am: c51d68746c am: 93f8319bc7" into nyc-mr2-dev-plus-aosp