| commit | c968879eb69d933fa260f43605a124a6dc7d0ea3 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Apr 28 19:46:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 28 19:46:13 2016 +0000 |
| tree | f7ac598ddae03dc7fe41fa6673d185dee67d4c65 | |
| parent | a85a7b9c75a9c3b2d737d2bc672c91fa69035891 [diff] | |
| parent | 99feacb0263f8331e9afcbfdbc0a4322de75593c [diff] |
Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp am: 99feacb026 * commit '99feacb0263f8331e9afcbfdbc0a4322de75593c': Fix google-explicit-constructor warnings. Change-Id: Ifb8bda3157f17c400ae403056bbef3b3c3625ea8