summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2011-01-26 14:15:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 14:15:17 -0800
commit5f3e04940c993d4f8c20b9f00f057889194445d5 (patch)
tree4d5bc35d5457c089aceda2ca91e84d015aa50541
parent323c16039005ccc150804d30db3fad22c19c4117 (diff)
parentb8cedf7bc99ad52d739949ea1af1184b489c04da (diff)
downloadmsm7k-5f3e04940c993d4f8c20b9f00f057889194445d5.tar.gz
am b8cedf7b: (-s ours) am 39c0d4c0: (-s ours) do not merge bug 3370834 Cherrypick from master CL 79327
* commit 'b8cedf7bc99ad52d739949ea1af1184b489c04da': do not merge bug 3370834 Cherrypick from master CL 79327
0 files changed, 0 insertions, 0 deletions