| commit | b7279d7562d5a04ff534c0f94c4c255c782fe0fd | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Wed Jan 10 19:21:15 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 10 19:21:15 2018 +0000 |
| tree | 8f9c3f00eac05097fb4e8b846ce244157f5aeee2 | |
| parent | c0411106a9da989b7578652a390027e011bb22c7 [diff] | |
| parent | c38071e78cc28ca02d92f2878c5c8941750a1bdd [diff] |
Merge changes from topic "mm" into marshmallow-cts-dev am: ae98d2106a am: c38071e78c Change-Id: I568210f6e8c9a1eb65da3a80173fa0fb6c74da53