commit | 1c8886234d9c178fd42857a23a1b30ab61bdd2ea | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Jun 09 17:44:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 09 17:44:31 2015 +0000 |
tree | 14a9ede21126ed663aa20aeae1368a51ec965ca5 | |
parent | cf0596668ecda6a278095508fca3caee73d2b943 [diff] | |
parent | 3770cadb60fed02ca48f61a32a29ef5cfdc57dae [diff] |
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 '3770cadb60fed02ca48f61a32a29ef5cfdc57dae': DO NOT MERGE - bump CTS version to CTS 5.0_r3