| commit | 0a0696014cf3f20443eed0a9d74437e427eeb425 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu May 12 02:56:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 12 02:56:10 2016 +0000 |
| tree | cfd3ef6a34845a9e404d59a84507e4c2b064b6a1 | |
| parent | 30bbbaa3fb079defd8911bfa3b6cef659077afdb [diff] | |
| parent | c34219624939ee722597dc8a3fa98105a472f4ab [diff] |
resolve merge conflicts of b97dd87 to nyc-dev-plus-aosp am: c342196249 * commit 'c34219624939ee722597dc8a3fa98105a472f4ab': Delete R.class/etc. in support library jar files shipped in SDK Change-Id: I05fbdcf99f4cd69434881b434ef9682b852655dc