| commit | 3c5bb4a710ee82a7ed7333f31e643239479eb461 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Mar 16 22:39:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 22:39:54 2017 +0000 |
| tree | 3e1d290cd9dc83bb307a474fca81e919dffce6cd | |
| parent | 135e6bf3671ee68df8d53f9fa48a17654e1acfac [diff] | |
| parent | dc7e5158b9976e32f358a5e554fea511b73de306 [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 am: 8ebcfa60ff am: dc7e5158b9 Change-Id: I8080f9e4d751f3dfa759d7d3fccfb91f04bbe2d8