| commit | ecab77f1f4e09ca23d2b40e54a64b809513372c3 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jul 06 17:30:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 17:30:21 2015 +0000 |
| tree | 25c5f210d3b6b7e870fa33dacc8966952f295207 | |
| parent | 6428482516684c75cb446cf10272bc8a15b7d93a [diff] | |
| parent | 15c96eb137f16d2422d4be8646df15138560c722 [diff] |
am 15c96eb1: (-s ours) am 4f6fd6a5: (-s ours) am 1a0e0d03: (-s ours) am dbba00b8: (-s ours) Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R2" into lollipop-mr1-cts-dev * commit '15c96eb137f16d2422d4be8646df15138560c722': DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R2