summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* libcutils: Don't build host property supportNick Kralevich2013-05-232-1/+7
* adb: Only use properties on device buildsNick Kralevich2013-05-234-1/+5
* am 54d19aa6: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
|\
| * Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
| |\
| | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-230-0/+0
| | |\
* | | | am 5cb9a02b: am 7e723498: Merge "Add permission for bluetooth app in non-prim...Matthew Xie2013-05-221-0/+8
|\| | |
| * | | am 7e723498: Merge "Add permission for bluetooth app in non-primary users" in...Matthew Xie2013-05-221-0/+8
| |\| |
| | * | Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-devMatthew Xie2013-05-221-0/+8
| | |\ \
| | | * | Add permission for bluetooth app in non-primary usersMatthew Xie2013-05-221-0/+8
* | | | | Merge "Format stack trace PC offset to 8 digits with leading zeros."Ben Cheng2013-05-211-8/+9
|\ \ \ \ \
| * | | | | Format stack trace PC offset to 8 digits with leading zeros.Ben Cheng2013-05-211-8/+9
* | | | | | am a9e08d3e: am 51a2e4d5: Merge "libsysutils: fix null pointer and memory lea...Colin Cross2013-05-211-1/+8
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 51a2e4d5: Merge "libsysutils: fix null pointer and memory leak issue"Colin Cross2013-05-211-1/+8
| |\ \ \ \
| | * \ \ \ Merge "libsysutils: fix null pointer and memory leak issue"Colin Cross2013-05-211-1/+8
| | |\ \ \ \
| | | * | | | libsysutils: fix null pointer and memory leak issueHong-Mei Li2013-05-201-1/+8
* | | | | | | am 084753ee: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-210-0/+0
|\| | | | | |
| * | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-210-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-210-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | am 5f1a938e: am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated led-...Colin Cross2013-05-201-6/+0
|\| | | | | |
| * | | | | | am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
| | | |\ \ \ \ \
| | | | * | | | | init.rc: remove duplicated led-related nodesSungmin Choi2013-05-191-6/+0
| | | |/ / / / /
* | | | | | | | am 8f6adcfc: am 49be2407: Revert "Add logic to fixup file contexts after a po...gcondra@google.com2013-05-201-6/+1
|\| | | | | | |
| * | | | | | | am 49be2407: Revert "Add logic to fixup file contexts after a policy update."gcondra@google.com2013-05-201-6/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Revert "Add logic to fixup file contexts after a policy update."repo sync2013-05-171-6/+1
* | | | | | | | am 253e91b4: am 477e35d6: Revert "Add persistent property for SELinux enforcm...gcondra@google.com2013-05-202-7/+0
|\| | | | | | |
| * | | | | | | am 477e35d6: Revert "Add persistent property for SELinux enforcment status."gcondra@google.com2013-05-202-7/+0
| |\| | | | | |
| | * | | | | | Revert "Add persistent property for SELinux enforcment status."repo sync2013-05-172-7/+0
* | | | | | | | am 43329bc1: am 8a387870: Revert "Reload policy after setting up the data par...gcondra@google.com2013-05-205-13/+3
|\| | | | | | |
| * | | | | | | am 8a387870: Revert "Reload policy after setting up the data partition."gcondra@google.com2013-05-205-13/+3
| |\| | | | | |
| | * | | | | | Revert "Reload policy after setting up the data partition."repo sync2013-05-175-13/+3
* | | | | | | | am f5410f2b: am 3d32cd93: Revert "Remove /system from the dirs to relabel."gcondra@google.com2013-05-201-0/+1
|\| | | | | | |
| * | | | | | | am 3d32cd93: Revert "Remove /system from the dirs to relabel."gcondra@google.com2013-05-201-0/+1
| |\| | | | | |
| | * | | | | | Revert "Remove /system from the dirs to relabel."repo sync2013-05-171-0/+1
* | | | | | | | am b9866649: am 52351300: Revert "Add a version check for SELinux policy on d...gcondra@google.com2013-05-202-62/+3
|\| | | | | | |
| * | | | | | | am 52351300: Revert "Add a version check for SELinux policy on device."gcondra@google.com2013-05-202-62/+3
| |\| | | | | | | | |/ / / / / | |/| | | | |
| | * | | | | Revert "Add a version check for SELinux policy on device."repo sync2013-05-172-62/+3
| | | |_|_|/ | | |/| | |
* | | | | | am 19ec15b2: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
|\| | | | |
| * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-150-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-080-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-010-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-250-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-220-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-170-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-160-0/+0
| | | | | | | | | |\ \ \
* | | | | | | | | | | | | am 3ce15fcc: am de1dadb7: Merge "Disable darwin build"Brian Carlstrom2013-05-151-1/+3
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am de1dadb7: Merge "Disable darwin build"Brian Carlstrom2013-05-151-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |