commit | 04d23e6526745822df2e62d78160fdcb1bd0a2e6 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Oct 27 23:48:53 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 27 23:48:53 2015 +0000 |
tree | 9d5010ea8e68501e023e8dfe4fc4f7c69c582073 | |
parent | a19e37ebdd7c3a36ee7d9080d7b17e25b989c0dc [diff] | |
parent | e9e56b476b38562f3096ddf8b2072396b0e6fc5e [diff] |
Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 2a72b1b08e -s ours am: c1f6baf9ec -s ours am: ba72ac87a7 -s ours am: e9e56b476b -s ours * commit 'e9e56b476b38562f3096ddf8b2072396b0e6fc5e': DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4