| commit | ade8640d4d48852b9ce36651418b0606139f04fe | [log] [tgz] |
|---|---|---|
| author | Phil Weaver <pweaver@google.com> | Tue Jul 18 21:55:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 21:55:39 2017 +0000 |
| tree | 3332b080461b06b9f2e9ec09075aed0ba211e7f2 | |
| parent | 2e690de9cf894c23dc8306322b69fb4650dc4262 [diff] | |
| parent | 6fee9a5e9193d1236597c74f2a729de21895f15e [diff] |
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d