| commit | 9bedd1a003945ec9cb1f1c8e3278588c7e7570b8 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Tue May 24 01:19:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 01:19:35 2016 +0000 |
| tree | 6930deb10e9c1f0f7e7a160773455edbd0d027d4 | |
| parent | 8a43084979c3fc3da20e23fc325922e5d01e2424 [diff] | |
| parent | 79c13cee260ebca72752439353fa739aa6f3230f [diff] |
resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp am: 79c13cee26 * commit '79c13cee260ebca72752439353fa739aa6f3230f': Change-Id: Ie0322322b0ff1768bb6b4c85c4d0c638a1a850ab