diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 21:33:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 21:33:14 +0000 |
| commit | 56a794f2bf3093c9b24889e44abdcefaa976ed12 (patch) | |
| tree | dad3e58c0a06acb52b0cfab53a0fbd8d24940cba /core/java/android/content/IContentProvider.java | |
| parent | 21dc46b14df9456eede9d4eb7082c85bec732058 (diff) | |
| parent | 96e30774c019e1f4400ac2d7a724ea7328bec1ac (diff) | |
| download | frameworks_base-56a794f2bf3093c9b24889e44abdcefaa976ed12.zip frameworks_base-56a794f2bf3093c9b24889e44abdcefaa976ed12.tar.gz frameworks_base-56a794f2bf3093c9b24889e44abdcefaa976ed12.tar.bz2 | |
am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '96e30774c019e1f4400ac2d7a724ea7328bec1ac':
resolve conflicts for merge 5a7b3b65 correctly
Diffstat (limited to 'core/java/android/content/IContentProvider.java')
0 files changed, 0 insertions, 0 deletions