| commit | 9721ca4298397469612ec7586f9977f763af6a1e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 09 17:54:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 09 17:54:35 2015 +0000 |
| tree | 2ac8fcbc12ee3de9eedbf81cb1bdb3edfc5c703b | |
| parent | 8be154673f20040754aa88c7e1254d09d256f6f8 [diff] | |
| parent | 1c8886234d9c178fd42857a23a1b30ab61bdd2ea [diff] |
am 1c888623: am 3770cadb: (-s ours) Merge "DO NOT MERGE - bump CTS version to CTS 5.0_r3" into lollipop-cts-dev automerge: 6c43c15 -s ours * commit '1c8886234d9c178fd42857a23a1b30ab61bdd2ea': DO NOT MERGE - bump CTS version to CTS 5.0_r3