| commit | 24a27237e9c0976a02f37a048eae815cb003b5e1 | [log] [tgz] |
|---|---|---|
| author | Yoland Yan <yolandyan@google.com> | Tue Dec 20 22:41:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 20 22:41:03 2016 +0000 |
| tree | 0978787043f849a015de39a78be23689468f0432 | |
| parent | 871d228eb633401507b1f978a9428cfa3766bf38 [diff] | |
| parent | dfdd2afc5feb83a7f4f42ebdff195a4b769f74db [diff] |
DO NOT MERGE resolve merge conflicts of f5f94cc to marshmallow-cts-dev am: dfdd2afc5f -s ours Change-Id: Ibe08fce52a1e8a099fe7807f1784f2666d6a0d5c