| commit | 5d7e6d1174f98335ba7e042f6e03100aaaa8b231 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 13 18:53:28 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 13 18:53:28 2018 -0700 |
| tree | e05181f57d25fc90adc5534363f5bdb2834cd3f9 | |
| parent | 017827b92f7f1366bd95b9b563e6f87810d217a7 [diff] | |
| parent | def9d98746aa18aa453f4245538bcad4a4467287 [diff] |
Merge stage-dr1-aosp-master into stage-aosp-master am: 152ea4e031 am: def9d98746 Change-Id: I73e277b35b751a91d52ed9b0aaf6dcc4f0a5cfd3