| commit | 7ac7214b78dbd329c867c36f7aa5eb27abf7e35b | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Sun Jul 31 03:43:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Jul 31 03:43:31 2016 +0000 |
| tree | d748906a24d949f2ec43f51253f63f233e07ed74 | |
| parent | d2ec3683e5300c6c1b752a1b4d69d723711983df [diff] | |
| parent | 1398e8e5aa9766722d9842feb7254c1117e60162 [diff] |
resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp am: 1398e8e5aa Change-Id: I187acf0aa781dcb88248e52361bcd097ced92312