| commit | 7e34612e2b5db65ecff13ff65b3816fffb7a0974 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon May 02 19:43:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 02 19:43:04 2016 +0000 |
| tree | 6b17e7f1540458e2f1abbe1c082353f920edc3df | |
| parent | f698bdef20e57e78f9e16be2cfa96450766f7033 [diff] | |
| parent | 47734c9509ecb472c2844cae46e2d916b9358321 [diff] |
resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp am: 47734c9509 * commit '47734c9509ecb472c2844cae46e2d916b9358321': Fix google-explicit-constructor warnings. Change-Id: If4948e1ed739833cfe090954fb219029750d7b7e