commit | 5d9333963546e7d933d969d670086649ad735bdf | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Sun Apr 17 05:51:40 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 17 05:51:40 2016 +0000 |
tree | 1d8740226195e3c3fc85bc9b93e88cf14d0dff6c | |
parent | 924abaa50fa42d2eddba815be1d4da7180fb8452 [diff] | |
parent | b4fcde1ba64f753d6f44b1301324fc315688c52f [diff] |
Merge "Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7" into lollipop-mr1-cts-dev am: 0d37ebf -s ours" into marshmallow-cts-dev am: ee5f83a -s ours am: ed16127 -s ours am: 9e9a9cf -s ours am: 0b06695 -s ours am: b4fcde1 -s ours * commit 'b4fcde1ba64f753d6f44b1301324fc315688c52f': DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7 Change-Id: Ia917f446d7f85efa98450781a795103d2e53e5ff