merg complete

This commit is contained in:
2016-01-22 00:53:11 +01:00
parent 81c4347cf1
commit 3c5d7f9b37
193 changed files with 40 additions and 71 deletions

View File

@@ -1,6 +1,6 @@
/*
* This file is auto-generated. DO NOT MODIFY.
* Original file: C:\\Projekte\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
* Original file: C:\\Ionic\\Ionic\\git2\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
*/
package com.android.vending.billing;
/**