| commit | 382d91910d4d29412034b3cce4c8fa204c67a93a | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Feb 26 14:33:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 26 14:33:56 2016 +0000 |
| tree | 58c717c467f3bd1689838bb985f627e9811a8aa9 | |
| parent | 63a3848c37edbddca9fd61150d336e07b36600b5 [diff] | |
| parent | 21491a7cd98e081ef40639e9e425059ca9d8aeeb [diff] |
resolve merge conflicts of c220078c9a to stage-aosp-master am: 43fde51300 -s ours am: 21491a7cd9 * commit '21491a7cd98e081ef40639e9e425059ca9d8aeeb': Pin support libraries to Java 1.7 so they can be used with dx