| commit | dfdd2afc5feb83a7f4f42ebdff195a4b769f74db | [log] [tgz] |
|---|---|---|
| author | Yoland Yan <yolandyan@google.com> | Mon Dec 19 15:27:51 2016 -0800 |
| committer | Yoland Yan <yolandyan@google.com> | Tue Dec 20 18:22:05 2016 +0000 |
| tree | dd59337f1fb004e8468279aa020e1864c161fefb | |
| parent | 8f10ed816c182e8b077ee0ab848aed86eddb7247 [diff] | |
| parent | f5f94cc9341818d43c0f240808972c110afc4ca8 [diff] |
DO NOT MERGE resolve merge conflicts of f5f94cc to marshmallow-cts-dev Change-Id: I7406813bd0feece9fc8a9d9101858e10c6f96591