diff options
| author | Michael Wright <michaelwr@google.com> | 2014-12-30 12:59:10 -0800 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2014-12-30 12:59:10 -0800 |
| commit | 3979c0bf42734e0e608c0e583b18b892b0583377 (patch) | |
| tree | e204cceed5a8ed6f1658c091c1b45f6e924d41a4 /core/java/android/content/IContentProvider.java | |
| parent | aa118f67a790121ebf81b33eacc1e6af5ab989cc (diff) | |
| parent | 342e9030002e5a1c654f3f802e0d6cc0498ac32c (diff) | |
| download | frameworks_base-3979c0bf42734e0e608c0e583b18b892b0583377.zip frameworks_base-3979c0bf42734e0e608c0e583b18b892b0583377.tar.gz frameworks_base-3979c0bf42734e0e608c0e583b18b892b0583377.tar.bz2 | |
resolve merge conflicts of 342e903 to master.
Change-Id: Id8404cce5c1c8e7818e5d164f93207a8c17cf7bb
Diffstat (limited to 'core/java/android/content/IContentProvider.java')
0 files changed, 0 insertions, 0 deletions