| commit | 218b365e6bebdbd39ec486b061682a48973a0e6e | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu May 12 03:01:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 12 03:01:14 2016 +0000 |
| tree | 314ae21dd06744bec844ebfdd031acdfcbc523a2 | |
| parent | 0d522c47c2e60f51bac732a409604d9cd9a60b84 [diff] | |
| parent | 6387be12ce6f9e40f3a1a9debea8c13d83c265e4 [diff] |
resolve merge conflicts of 0a08494 to nyc-mr1-dev-plus-aosp am: 6387be12ce * commit '6387be12ce6f9e40f3a1a9debea8c13d83c265e4': Delete R.class/etc. in support library jar files shipped in SDK Change-Id: Ic8d46fb3e1bd5d7932da82b664f14f87cb1fbbd4