| commit | 18d6db9a68246bdcfbc95aa312e3586902ffbdd2 | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Jun 21 21:35:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 21:35:16 2016 +0000 |
| tree | 6d359bd1963501e4ab9ce27a01f4465a728cac49 | |
| parent | da26da973bf75cae9c09a2ab14b5f51bd617c47a [diff] | |
| parent | 80f0d0f2a49e3f1651af5852b2a824c5261519fc [diff] |
resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp am: 80f0d0f2a4 Change-Id: Ic5a8d119a95930feaf406bca83ee4a4f591675f8