summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Heyl <edheyl@google.com>2013-02-04 11:29:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-04 11:29:18 -0800
commit5a0249e54930c369977be4ca1083d1e5d6db2fe1 (patch)
tree9cfd52049db5b888a20d3573800b0169b52ca550
parent21291f1ac5a74aaa435c2b04e3334b7aed1286d5 (diff)
parent823ce03898c92336fe67276fe5e679ef382dfce0 (diff)
downloadsystem_core-5a0249e54930c369977be4ca1083d1e5d6db2fe1.zip
system_core-5a0249e54930c369977be4ca1083d1e5d6db2fe1.tar.gz
system_core-5a0249e54930c369977be4ca1083d1e5d6db2fe1.tar.bz2
am 823ce038: (-s ours) am 2507aed4: reset to 016806a7, but keep bad history for fast forward
# By Iliyan Malchev # Via Android Git Automerger (3) and others * commit '823ce03898c92336fe67276fe5e679ef382dfce0': libsuspend: compile as a static library
0 files changed, 0 insertions, 0 deletions