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