summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'goog/stage-aosp-master' into HEADandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li2017-11-150-0/+0
|\ | | | | | | | | | | am: dc41adf793 Change-Id: I0eaa63c647a0941c735f58a4f0c2a149de80d051
| * Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-140-0/+0
| |\ | | | | | | | | | Change-Id: I7695d2fd08a5c9723528a429b536b68089ceeb08
| | * Merge commit '0ca06e252755158257c90f36642239954cb6508e' into HEADandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Xin Li2017-11-130-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I1babda9ec2e053f653dd5975d7808517c78e568c
* | | | Remove guava from libbackup dep. am: 06fcdc39c6 am: 6f90a54f2bZachary Heidepriem2017-11-111-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: d9d852aa33 Change-Id: Iae732d91c215f9956e9eee5b17a30ea8c8152ca2
| * | | Remove guava from libbackup dep. am: 06fcdc39c6Zachary Heidepriem2017-11-101-2/+0
| |\| | | | |/ | |/| | | | | | | | | | am: 6f90a54f2b Change-Id: If1a218ccbdb3c8a1109cddc25c3e57348c7067c9
| | * Remove guava from libbackup dep.Zachary Heidepriem2017-11-101-2/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 06fcdc39c6 Change-Id: Iccf08f2c2ecb160de0ad07edad422c0e19b6e5dd
| | | * Remove guava from libbackup dep.Zachary Heidepriem2017-11-101-2/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | It is only used in shadows, which are excluded srcs. Removing guava dep allows dialer to depend on its own current version of guava without there being class verison conflicts. Change-Id: I141a8a9642b1cf24351d095da6b8b85d5979da7b Test: mma
* | | Add make target for backup library. am: 2c4cc2cc8d am: 4599ef0948 am: b342ce6963Eric Erfanian2017-08-300-0/+0
|\| | | | | | | | | | | | | | | | | am: 0ca06e2527 Change-Id: I1b3c364c189e68ce0788a76ca2f05f5ff16a6b5b
| * | Add make target for backup library. am: 2c4cc2cc8d am: 4599ef0948Eric Erfanian2017-08-301-0/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | am: b342ce6963 Change-Id: I014cf6b85a328085d9d225f12feac58558e7d962
| | * | Add make target for backup library. am: 2c4cc2cc8dEric Erfanian2017-08-301-0/+20
| |/| | | | |/ | | | | | | | | | | | | am: 4599ef0948 Change-Id: I70d32df027d2f09bc0b81f775f484b93b0c54fe0
| | * Add make target for backup library.Eric Erfanian2017-08-301-0/+20
| |/| | | | | | | | | | | | | | | | am: 2c4cc2cc8d Change-Id: I1c8de14f9687403dcda64ee84c32581053831d31
| | * Add make target for backup library.android-o-mr1-preview-2android-o-mr1-preview-1Eric Erfanian2017-08-291-0/+20
| |/ | | | | | | | | Test: th Change-Id: I6692b4667cc73975e0fe1dfe5b283114b7a46b81
* | Use external/guava as the guava dependency.Eric Erfanian2017-08-181-11/+1
| | | | | | | | | | Test: make Change-Id: Ibb736ceb8ca0e5ce4760dc819cebcea6ee17e4ba
* | Add make target for AOSP build.Eric Erfanian2017-08-171-0/+30
|/ | | | | | | | | | Excludes the /shadow directory. Test: make, and linked against in an application that has this dependency. Change-Id: I085f6b82f9fbea980f267e1de58142fe2342e746 Bug: 64768452
* Add MODULE_LICENSE_APACHE2 and NOTICE filesandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devPetr Cermak2017-03-222-0/+13
| | | | Bug: 34489332
* Import from google3Transformer Team2017-02-163-10/+66
| | | | | | | | | See google3/third_party/java_src/android_libs/backup/copy.bara.sky. Project import generated by Copybara (go/copybara). PiperOrigin-RevId: 147723300 Change-Id: Ib2813e23bdd6e80e49734c3662b7e93783e13de2
* Import from google3Transformer Team2017-02-1410-0/+1216
| | | | | | | | | | | | See google3/third_party/java_src/android_libs/backup/copy.bara.sky. Project import generated by Copybara (go/copybara). Bug: 34489332 Bug: 35093989 Bug: 35129081 PiperOrigin-RevId: 146787977 Change-Id: I904e1ba370a33212aca8b7840ee78d6aee2e0924
* Add README.version for external/libbackupPetr Cermak2017-02-031-0/+4
Change-Id: I550ef541e8c510f5d625bf6b0565a45ac348c958 Bug: 34728983