| commit | a8be293bda68565f1900adc0cf7f703573d5ae88 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed May 25 04:44:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 04:44:47 2016 +0000 |
| tree | 701eb9b8f437b2936f10edc8f14f1c01bbe8cce3 | |
| parent | ffbbb380277cc1fddf843714c065b0d3a3202882 [diff] | |
| parent | 5e46b0171a2b3b78ff22957f5ed82c04954328bb [diff] |
Merge "Merge "Merge "DO NOT MERGE ANYWHERE: Update CTS to 5.0R7" into lollipop-cts-dev am: 15340ed38b -s ours" into lollipop-mr1-cts-dev am: 0606034452 -s ours" into marshmallow-cts-dev am: cf4047f982 -s ours am: 5e46b0171a -s ours * commit '5e46b0171a2b3b78ff22957f5ed82c04954328bb': DO NOT MERGE ANYWHERE: Update CTS to 5.0R7 Change-Id: I2f496729957e69724e25398102efdb5219430ed2