| commit | 8ebcfa60ff36a2373eda9241ec55cf890c540e50 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Mar 16 22:30:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 22:30:17 2017 +0000 |
| tree | 7f23d38503e4211c291f9827ff39183e49861783 | |
| parent | 999a12ed3a90b7e33c83f67a57a160c6cf909cd9 [diff] | |
| parent | 4c1f6f8fdd4695fe8e72ecf903f39395057962e1 [diff] |
Merge "Merge "DO NOT MERGE: Test for bug 33137046" into lollipop-mr1-cts-dev am: fb43b21e52 -s ours" into marshmallow-cts-dev am: 4c1f6f8fdd -s ours Change-Id: I69114cf9084ce4fadabd7a08bd09ba935de162c3