| commit | 7c5153c2ca524b35fae8ef888fcf700af0012a2e | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Fri May 27 00:17:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 27 00:17:05 2016 +0000 |
| tree | e418a2a9dc701313158876fa08f3242cf5048cbb | |
| parent | d4b7245eef2e781c06e9763f777f1e1ce2de1460 [diff] | |
| parent | 238f4aafd211b1ce7c6e6d6d672e8e9301c99ed5 [diff] |
resolve merge conflicts of dfcf2e0 to nyc-dev-plus-aosp am: 238f4aafd2 * commit '238f4aafd211b1ce7c6e6d6d672e8e9301c99ed5': Remove unnecessary variables Change-Id: I01914bb0547f7702f5b7dcd864676acc59f20afb