| commit | 49ac2a724c82f5670a811ae74551a5e9c529bb69 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon May 02 19:47:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 02 19:47:55 2016 +0000 |
| tree | a744aba402c9d7a9d62d14ee0794b336cf52d8ca | |
| parent | c9492a9c242edebd9befbc9ce116f5bed6443fae [diff] | |
| parent | 7e34612e2b5db65ecff13ff65b3816fffb7a0974 [diff] |
resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp am: 47734c9509 am: 7e34612e2b * commit '7e34612e2b5db65ecff13ff65b3816fffb7a0974': Fix google-explicit-constructor warnings. Change-Id: I5b1e3eae1348800c288e30845c6eb6d1bf69e72f