| commit | dd6db54de6c78fec734fdf39777260d552a8c5b7 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Fri Jan 06 23:41:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 23:41:35 2017 +0000 |
| tree | b61387237e3481fde64851f9a619e63542fd180e | |
| parent | 6a6145036b497901a9d7d4a842064fc4be730671 [diff] | |
| parent | 7099bf7d627e7f3a61cc46d56381e508eae29c3f [diff] |
Merge "Revert "resolve merge conflicts of 2537ffdefc to marshmallow-cts-dev"" into marshmallow-cts-dev am: 7099bf7d62 Change-Id: Ibeb83150c0e3b2146250aba707ba152a165c69d9