| commit | 2ba7ef5b48257b0f3220d6075f5badcc7e48795d | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Wed Jan 10 19:13:07 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 10 19:13:07 2018 +0000 |
| tree | a1fc7661a28ec1bcb88324a6a8f15b4bcff459d1 | |
| parent | dfbb7a24e1ce4c18fd9bd8ee27e39cc841814567 [diff] | |
| parent | 299670260708d3e8d4420f58f8b4cad543113b84 [diff] |
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 Change-Id: I210f8b36685e9e1dbcc2916b921501ed55ddb1fb