| commit | b9621ff1c4226ca577f82a03c92ce853698662cd | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Apr 28 16:33:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 28 16:33:00 2016 +0000 |
| tree | 61c61f99b0692670668a9e486bc91c9e34ecc62e | |
| parent | 96e36addf41c0e4676a1a7b4f1d1f71379751336 [diff] | |
| parent | 68a593e7fa07c947fef2c5de53c42e14ed630a8a [diff] |
resolve merge conflicts of 168dc86 to nyc-dev-plus-aosp am: 68a593e * commit '68a593e7fa07c947fef2c5de53c42e14ed630a8a': Fix google-explicit-constructor warnings. Change-Id: Ie97ebad15c0271c9b5ae8cb05d60c47315b97ddc