| commit | fcfcd1e5635fe052f9641f586ed93b5f6f011dfb | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri Jun 17 18:49:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 18:49:49 2016 +0000 |
| tree | 1dbc3d3d23905abb098535cbf0a4986ad696d817 | |
| parent | 11e5ef71f59f6eb8ebeac8721d8c1d7b13df9aee [diff] | |
| parent | 83eab26cf28c1937f23b017be8a5f3513a83c4ec [diff] |
Merge changes I25d9ac3e,I783dac75 am: 83eab26cf2 Change-Id: Ibe5fd16e2c7737bca240fe3da633363f3ff5564c