aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-08-11 18:11:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-11 18:11:42 -0700
commit1ca67119057d31da00bd2e998c6fa8ccb651b948 (patch)
tree1671ce8a02896d0cc2df66b88c142a2e2d07cc42
parent37b210f56036cda41b0407e841fe79fb4db310fc (diff)
parent704aa833382a73f8e02d49b7e9c2aef9a49c65bd (diff)
downloadsystem_core-1ca67119057d31da00bd2e998c6fa8ccb651b948.tar.gz
system_core-1ca67119057d31da00bd2e998c6fa8ccb651b948.tar.bz2
system_core-1ca67119057d31da00bd2e998c6fa8ccb651b948.zip
am 704aa833: (-s ours) DO NOT MERGE cherry-pick "adb reboot" from master:
Merge commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd' * commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd': DO NOT MERGE cherry-pick "adb reboot" from master:
0 files changed, 0 insertions, 0 deletions