summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-27Merge "Add OWNERS in prebuilts/python/linux-x86/2.7.5" am: 7bd52e8c08 am: ↵ndk-r17bndk-r17-beta2ndk-r17-beta1ndk-r17android-wear-8.0.0_r1oreo-mr1-devndk-release-r17Chih-Hung Hsieh
621d405f7e am: ec9e253a30 am: 7bd79b4f40 Change-Id: Ic48428a17f35c1543071ea6e85724d80f36f6f32
2017-06-26Merge "Add OWNERS in prebuilts/python/linux-x86/2.7.5" am: 7bd52e8c08 am: ↵android-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-Hung Hsieh
621d405f7e am: ec9e253a30 Change-Id: If387d96d89511e7ccb674e17e64aff659d5449c8
2017-06-26Merge "Add OWNERS in prebuilts/python/linux-x86/2.7.5" am: 7bd52e8c08Chih-Hung Hsieh
am: 621d405f7e Change-Id: I0398fae4c9432a362333a835a2a72787ee792f9b
2017-06-26Merge "Add OWNERS in prebuilts/python/linux-x86/2.7.5"android-o-mr1-preview-2android-o-mr1-preview-1Chih-Hung Hsieh
am: 7bd52e8c08 Change-Id: I9cdaf3dd5856e35b10d9fc8ebe0582ad1ab0eb5c
2017-06-26Merge "Add OWNERS in prebuilts/python/linux-x86/2.7.5"ndk-r16-beta2ndk-r16-beta1ndk-r16android-o-preview-4android-o-iot-preview-5o-iot-preview-5ndk-release-r16ndk-r16-releaseTreehugger Robot
2017-06-26Add OWNERS in prebuilts/python/linux-x86/2.7.5Chih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I9c7bcc0aa260f51ce5b76a3bf4a422c95b10d806
2016-05-19Merge "Update prebuilt setools to 4.0.1" am: ce294655f9 am: 76c19f6c64 am: ↵android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-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_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseJeff Vander Stoep
a3f090d3e5 am: 3229c5a245 * commit '3229c5a24529bad2a85691f17d9e75a300af5085': Update prebuilt setools to 4.0.1 Change-Id: Ia6f413968679324e67db6dae7529a528f0fa6a7d
2016-05-19Merge "Update prebuilt setools to 4.0.1" am: ce294655f9 am: 76c19f6c64ndk-r15-beta2ndk-r15-beta1android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewndk-r15-releasen-iot-preview-4Jeff Vander Stoep
am: a3f090d3e5 * commit 'a3f090d3e5c1edb1fc7b769fc89ae2f27ea85a02': Update prebuilt setools to 4.0.1 Change-Id: If432c8784bf00a8f2c10e7d415298f695935d5e3
2016-05-19Merge "Update prebuilt setools to 4.0.1" am: ce294655f9ndk-r14-beta2ndk-r14-beta1ndk-r14android-n-mr1-preview-2android-n-mr1-preview-1ndk-r14-releaseJeff Vander Stoep
am: 76c19f6c64 * commit '76c19f6c64369d63c04299128a1f0821ff6b1ae5': Update prebuilt setools to 4.0.1 Change-Id: If0160bb1ac346039203081addbd8aba261f18700
2016-05-19Merge "Update prebuilt setools to 4.0.1"Jeff Vander Stoep
am: ce294655f9 * commit 'ce294655f981e19b420f2201b7c499a435ef1ce2': Update prebuilt setools to 4.0.1 Change-Id: I9659162cb9691c6b707bcf66571b3f2e9059d3cd
2016-05-19Merge "Update prebuilt setools to 4.0.1"ndk-r13-beta2ndk-r13-beta1ndk-r13android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasendk-r13-releasen-iot-preview-2Treehugger Robot
2016-05-19Update prebuilt setools to 4.0.1Jeff Vander Stoep
Adds support for extended permissions. Change-Id: I813b6267a73ac31c33136dbd71b8ed56cb47ed42
2016-02-09Add sepolgen for audit2allowJeff Vander Stoep
am: 74e4f93e81 * commit '74e4f93e81205ac85f74eaf5fd4c86515779aee1': Add sepolgen for audit2allow
2016-02-08Add sepolgen for audit2allowandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releaseJeff Vander Stoep
(cherry picked from commit fcd1ca896d5e281901703561abc303cf92423daa) Addresses: ImportError: No module named sepolgen.audit Change-Id: I320a5c772bd55cc223d8484b6b8db22bacd2b4c5
2016-02-08Merge "Add sepolgen for audit2allow"ndk-r12bndk-r12-beta2ndk-r12-beta1android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2android-n-preview-1ndk-r12-releasebrillo-m10-releasebrillo-m10-devJeffrey Vander Stoep
2016-02-08Add sepolgen for audit2allowJeff Vander Stoep
Addresses: ImportError: No module named sepolgen.audit Change-Id: I320a5c772bd55cc223d8484b6b8db22bacd2b4c5
2016-02-04Merge "setools: fix sesearch, add sediff"Jeffrey Vander Stoep
2016-02-04setools: fix sesearch, add sediffJeff Vander Stoep
Bug: 26480956 Change-Id: I7b493a51e2a504119d844d9bc57465b3c21bd970
2016-01-06Merge "Add setools version"ndk-r11cndk-r11bndk-r11ndk-r11-releasebrillo-m9-releasebrillo-m9-devJeffrey Vander Stoep
2016-01-05Add setools versionJeff Vander Stoep
Addresses the following error: File "/android_source/AOSP/external/selinux/prebuilts/bin/sesearch.py", line 21, in <module> import setools File "/android_source/AOSP/prebuilts/python/linux-x86/2.7.5/lib/python2.7/site-packages/setools/__init__.py", line 23, in <module> __version__ = pkg_resources.get_distribution("setools").version File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 344, in get_distribution if isinstance(dist,Requirement): dist = get_provider(dist) File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 223, in get_provider return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0] File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 725, in require needed = self.resolve(parse_requirements(requirements)) File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 628, in resolve raise DistributionNotFound(req) pkg_resources.DistributionNotFound: setools Change-Id: I69b033416e687d77c5839433542ee21056c6b93b
2015-12-11Merge "selinux: update prebuilt tools"brillo-m8-releasebrillo-m8-devJeffrey Vander Stoep
2015-12-11selinux: update prebuilt toolsJeff Vander Stoep
Audit2allow, audit2why, and sesearch are all broken with the update to upstream policy version 30. Updating prebuilts fixes these issues. Change-Id: I305ffa5b153a21304dd6d8eece1577f9cbf5d142
2015-11-05Merge "Add LICENSE"Bill Yi
2015-11-05Add LICENSEBill Yi
Change-Id: If03f19cda138af67d1f0bba197552c612c9e5fc6
2015-08-27am 1e1912e8: (-s ours) am f63d822b: Ignore .pyc files.Ying Wang
* commit '1e1912e8147813d63faf3c3a687a6f664dbe7bbb':
2015-08-27am 36211b10: (-s ours) am 583652f1: Merge "Fix python sed rewriting for linux."Elliott Hughes
* commit '36211b105bcacdeba220a16145824404abe1d8c4':
2015-08-27am 5b616ea5: (-s ours) am 9ce095c8: Merge "selinux prebuilts: ignore .pyc files"Jeff Vander Stoep
* commit '5b616ea5b2fa8495684012b1543dbe1d5344cce3':
2015-08-22am f63d822b: Ignore .pyc files.Ying Wang
* commit 'f63d822b31f41bc1be234ad64a7f09de9221444f': Ignore .pyc files.
2015-08-21am f63d822b: Ignore .pyc files.brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devYing Wang
* commit 'f63d822b31f41bc1be234ad64a7f09de9221444f': Ignore .pyc files.
2015-08-21Ignore .pyc files.android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseYing Wang
Bug: 23419062 Change-Id: I7e7cc79f8737efc521e6ac35479efd13338aa0f4
2015-07-15am 583652f1: Merge "Fix python sed rewriting for linux."Elliott Hughes
* commit '583652f1b6e213ea1763099736dabc8070798d47': Fix python sed rewriting for linux.
2015-07-15am 583652f1: Merge "Fix python sed rewriting for linux."Elliott Hughes
* commit '583652f1b6e213ea1763099736dabc8070798d47': Fix python sed rewriting for linux.
2015-07-15Merge "Fix python sed rewriting for linux."android-m-preview-2Elliott Hughes
2015-07-14Fix python sed rewriting for linux.Elliott Hughes
Change-Id: Iee1e046f29290ceb266527de18170ed69e8c611c
2015-07-06am 9ce095c8: Merge "selinux prebuilts: ignore .pyc files"Jeff Vander Stoep
* commit '9ce095c8b7a67a5a6e6d113ed53c0c3761133d54': selinux prebuilts: ignore .pyc files
2015-07-06am 9ce095c8: Merge "selinux prebuilts: ignore .pyc files"Jeff Vander Stoep
* commit '9ce095c8b7a67a5a6e6d113ed53c0c3761133d54': selinux prebuilts: ignore .pyc files
2015-07-06Merge "selinux prebuilts: ignore .pyc files"android-m-preview-1Jeff Vander Stoep
2015-07-06selinux prebuilts: ignore .pyc filesJeff Vander Stoep
Change-Id: Ic0ca8592061de69b93d7d6e7ef050089b23e3f3d
2015-06-19am a8a6732f: SELinux: python modules for selinux toolsJeff Vander Stoep
* commit 'a8a6732ff6e9d5e49a8c6e888716ed98d64e2609': SELinux: python modules for selinux tools
2015-06-18SELinux: python modules for selinux toolsJeff Vander Stoep
<tool(s)>: <required python modules> audit2allow audit2why: sepolgen selinux sesearch: setools setoolsgui (cherry picked from fe63c8d5e6e841f474eec96e2dd38d8fa97a17f8) Bug: 21928182 Change-Id: Ifc19252d8d8e178b86c51fe1f54e162a61ffc0dd
2015-06-18Merge "SELinux: python modules for selinux tools"Jeff Vander Stoep
2015-06-18SELinux: python modules for selinux toolsJeff Vander Stoep
<tool(s)>: <required python modules> audit2allow audit2why: sepolgen selinux sesearch: setools setoolsgui Change-Id: Ifc19252d8d8e178b86c51fe1f54e162a61ffc0dd
2014-07-23Merge "Don't check in compiled Python."android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-m-previewandroid-l-preview_r2master-soonglollipop-wear-releasel-previewDan Albert
2014-07-31Don't check in compiled Python.Dan Albert
repo status showing me diffs in compiled code is just annoying. Change-Id: Ib80a30f88b327c312a1486731f1e9ef700246d23
2013-12-05am 880b9a71: Merge commit \'019401cfcd774b96bd6cac52b72715b84f223cd1\' into HEADandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseThe Android Open Source Project
* commit '880b9a71dab8a0f744acef6e6b42d1f27ca5f4c8':
2013-12-05Merge commit '019401cfcd774b96bd6cac52b72715b84f223cd1' into HEADidea133-weekly-releaseidea133The Android Open Source Project
2013-11-22am b51d3298: Merge commit \'826b23851575eece3a3d1ae3bfba73b0060a36f8\' into HEADThe Android Open Source Project
* commit 'b51d32984add6ffc67ad9b1f6e2da5a41fa422df':
2013-11-22Merge commit '826b23851575eece3a3d1ae3bfba73b0060a36f8' into HEADThe Android Open Source Project
2013-10-20am 6349336e: Merge "Revise python 2.7.5 from 64-bit to 32-bit"Andrew Hsieh
* commit '6349336e4cf65fcca6ab70deecd280fbe7d1143f': Revise python 2.7.5 from 64-bit to 32-bit
2013-10-21Merge "Revise python 2.7.5 from 64-bit to 32-bit"Andrew Hsieh