| commit | 66932e3e49e180729a3d0204796999441cd3d1bd | [log] [tgz] |
|---|---|---|
| author | junyulai <junyulai@google.com> | Mon Jan 21 10:53:47 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 21 10:53:47 2019 -0800 |
| tree | 069c5801a9db722312795ee6e5d339fa1485d424 | |
| parent | 69c19ec21b7d166b476c29fb154d7a59643685e9 [diff] | |
| parent | 2c811e8843fa470d495f4c63ea24f6cc43b9edba [diff] |
Merge "resolve merge conflicts of da290bec0c5418e758b92abad7be8e729cf37d68 to stage-aosp-master" into stage-aosp-master am: 2c811e8843 Change-Id: Ibdbccc7b205677c9f3e7b0b876c13c83c0c51a70