| commit | c38071e78cc28ca02d92f2878c5c8941750a1bdd | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Wed Jan 10 19:14:55 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 10 19:14:55 2018 +0000 |
| tree | db10aba85c79912077ab3a0f587de1215f9961b4 | |
| parent | 65408dc31227bd7d3582d0fe9ab6682087ec55de [diff] | |
| parent | ae98d2106a0a9ab65cf48916ca75a7adc6e5afbd [diff] |
Merge changes from topic "mm" into marshmallow-cts-dev am: ae98d2106a Change-Id: I83fc43766f88ece92ea6eb13ff7bd5054bc76d39