summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2011-01-29 09:54:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-29 09:54:33 -0800
commit9431a9e6d6a02577b24fe8eb2ed5d4780993c9ba (patch)
tree4d5bc35d5457c089aceda2ca91e84d015aa50541
parent23c77eb31a9aa9d1ec0dfe089a40e46159fe3a1c (diff)
parent39c0d4c031d479a679900cb540253f42747cb810 (diff)
downloadmsm7k-9431a9e6d6a02577b24fe8eb2ed5d4780993c9ba.tar.gz
am 39c0d4c0: (-s ours) do not merge bug 3370834 Cherrypick from master CL 79327
* commit '39c0d4c031d479a679900cb540253f42747cb810': do not merge bug 3370834 Cherrypick from master CL 79327
0 files changed, 0 insertions, 0 deletions