commit | 911f99ab7e168d388f065631be29244e2f82ebee | [log] [tgz] |
---|---|---|
author | Raj Mamadgi <r.mamadgi@samsung.com> | Fri Jul 15 18:36:55 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 15 18:36:55 2016 +0000 |
tree | 7a9d74225a78880a1dd3d70bc166fb4dd42520c4 | |
parent | 482c4b1b5190bcaaaa3b469df7cbf9acf1535dc3 [diff] | |
parent | 820204800e58bf84c854067c383e28f48492f0d0 [diff] |
Merge \\\\\\"Merge \\\\\\\"Fix for ByodFlowTestActivity\\\\\\\" into lollipop-mr1-cts-dev am: 511a667d3e -s ours\\\\\\" into marshmallow-cts-dev am: 69d7ddb3d7 am: 34a8ba65e0 am: b7e4c8ce64 am: f4e19707c7 am: 6431069175 am: 820204800e Change-Id: I05c431b5a58919e22f2a1fdd9d609dc1a50eb82a