commit | c3a819d061fb42c3edd771ec2534bf54a9f7d096 | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Sat Dec 17 00:41:16 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Dec 17 00:41:16 2016 +0000 |
tree | d1d4d5b4de6b05995624349fe48667a9055f0243 | |
parent | d7f8755fd599111f6602c560fd24154807812502 [diff] | |
parent | b7086e2c4f06c5bcbab23c0d5e2c15d40ede5242 [diff] |
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f Change-Id: I6f0595dbed91c37b9efc53bdeed326d14169f32e