summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru2010-02-11 12:20:19 -0800
committerAndroid Git Automerger2010-02-11 12:20:19 -0800
commit8dd2e4ad17fc3195039782924cc91298d7d1263f (patch)
treeb9128f38242b2d7b1b7f665b8aafd458bb5c7f6a
parent24feaf6b650fffc1557c79b0681af372cc180671 (diff)
parent001eb417d9cc6abc7478fc3e0528b74f8289a758 (diff)
am 001eb417: Merge from open-source master
Merge commit '001eb417d9cc6abc7478fc3e0528b74f8289a758' * commit '001eb417d9cc6abc7478fc3e0528b74f8289a758':
0 files changed, 0 insertions, 0 deletions